From 97d82042c0d3846c239eabb3e8f91b471348a2fa Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Sun, 12 Mar 2023 06:03:23 -0400 Subject: [PATCH 01/60] Add mutiny to community integrations --- frontend/src/app/components/about/about.component.html | 4 ++++ frontend/src/resources/profile/mutiny.svg | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 frontend/src/resources/profile/mutiny.svg diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 73e7a17a2..8823f4aa8 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -284,6 +284,10 @@ Boltz + + + Mutiny + diff --git a/frontend/src/resources/profile/mutiny.svg b/frontend/src/resources/profile/mutiny.svg new file mode 100644 index 000000000..676c4d72c --- /dev/null +++ b/frontend/src/resources/profile/mutiny.svg @@ -0,0 +1,3 @@ + + + From a5e281706f2962cfc99305d3ca9f0149576f33a3 Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Sun, 12 Mar 2023 06:17:50 -0400 Subject: [PATCH 02/60] Make community integration rows symmetric and full --- frontend/src/app/components/about/about.component.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/components/about/about.component.scss b/frontend/src/app/components/about/about.component.scss index e538d724b..6873c9437 100644 --- a/frontend/src/app/components/about/about.component.scss +++ b/frontend/src/app/components/about/about.component.scss @@ -13,8 +13,8 @@ .image.not-rounded { border-radius: 0; - width: 74px; - height: 74px; + width: 60px; + height: 60px; } .intro { @@ -228,11 +228,11 @@ } .community-integrations-sponsor { - max-width: 965px; + max-width: 1110px; margin: auto; } .community-integrations-sponsor img.image { - width: 78px; - height: 78px; + width: 64px; + height: 64px; } From 3bf96dafde8333c7c2616e567e6d71a5502e7824 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Sun, 12 Mar 2023 19:20:29 +0900 Subject: [PATCH 03/60] Add network versioning to disk cache --- backend/src/api/disk-cache.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/api/disk-cache.ts b/backend/src/api/disk-cache.ts index af04d5acb..74b68b6be 100644 --- a/backend/src/api/disk-cache.ts +++ b/backend/src/api/disk-cache.ts @@ -55,6 +55,7 @@ class DiskCache { const chunkSize = Math.floor(mempoolArray.length / DiskCache.CHUNK_FILES); await fsPromises.writeFile(DiskCache.FILE_NAME, JSON.stringify({ + network: config.MEMPOOL.NETWORK, cacheSchemaVersion: this.cacheSchemaVersion, blocks: blocks.getBlocks(), blockSummaries: blocks.getBlockSummaries(), @@ -98,6 +99,7 @@ class DiskCache { const chunkSize = Math.floor(mempoolArray.length / DiskCache.CHUNK_FILES); fs.writeFileSync(DiskCache.TMP_FILE_NAME, JSON.stringify({ + network: config.MEMPOOL.NETWORK, cacheSchemaVersion: this.cacheSchemaVersion, blocks: blocks.getBlocks(), blockSummaries: blocks.getBlockSummaries(), @@ -160,6 +162,10 @@ class DiskCache { logger.notice('Disk cache contains an outdated schema version. Clearing it and skipping the cache loading.'); return this.wipeCache(); } + if (data.network && data.network !== config.MEMPOOL.NETWORK) { + logger.notice('Disk cache contains data from a different network. Clearing it and skipping the cache loading.'); + return this.wipeCache(); + } if (data.mempoolArray) { for (const tx of data.mempoolArray) { From 130ae8c3a5562ad38a0015b89d8f40f665c728a2 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Mon, 13 Mar 2023 12:48:01 +0900 Subject: [PATCH 04/60] Hide features row if tx has no features --- .../transaction/transaction.component.html | 3 ++- .../transaction/transaction.component.ts | 23 +++++++++++++++++++ .../tx-features/tx-features.component.html | 6 ++--- .../tx-features/tx-features.component.ts | 7 ++++++ 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index ec08c9303..04d13b07a 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -67,7 +67,7 @@ - + Features @@ -468,6 +468,7 @@ + diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index 899f5ee6b..c60d796e4 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -74,6 +74,12 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { flowEnabled: boolean; blockConversion: Price; tooltipPosition: { x: number, y: number }; + isMobile: boolean; + + featuresEnabled: boolean; + segwitEnabled: boolean; + rbfEnabled: boolean; + taprootEnabled: boolean; @ViewChild('graphContainer') graphContainer: ElementRef; @@ -197,6 +203,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { } this.tx = tx; + this.setFeatures(); this.isCached = true; if (tx.fee === undefined) { this.tx.fee = 0; @@ -291,6 +298,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { } this.tx = tx; + this.setFeatures(); this.isCached = false; if (tx.fee === undefined) { this.tx.fee = 0; @@ -428,9 +436,23 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { }); } + setFeatures(): void { + if (this.tx) { + this.segwitEnabled = !this.tx.status.confirmed || this.tx.status.block_height >= 477120; + this.taprootEnabled = !this.tx.status.confirmed || this.tx.status.block_height >= 709632; + this.rbfEnabled = !this.tx.status.confirmed || this.tx.status.block_height > 399700; + } else { + this.segwitEnabled = false; + this.taprootEnabled = false; + this.rbfEnabled = false; + } + this.featuresEnabled = this.segwitEnabled || this.taprootEnabled || this.rbfEnabled; + } + resetTransaction() { this.error = undefined; this.tx = null; + this.setFeatures(); this.waitingForTransaction = false; this.isLoadingTx = true; this.rbfTransaction = undefined; @@ -495,6 +517,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { @HostListener('window:resize', ['$event']) setGraphSize(): void { + this.isMobile = window.innerWidth < 850; if (this.graphContainer) { setTimeout(() => { this.graphWidth = this.graphContainer.nativeElement.clientWidth; diff --git a/frontend/src/app/components/tx-features/tx-features.component.html b/frontend/src/app/components/tx-features/tx-features.component.html index 54df244b2..e9e7a3b53 100644 --- a/frontend/src/app/components/tx-features/tx-features.component.html +++ b/frontend/src/app/components/tx-features/tx-features.component.html @@ -1,4 +1,4 @@ - + SegWit SegWit @@ -8,7 +8,7 @@ - + Taproot Taproot @@ -24,7 +24,7 @@ - + RBF RBF diff --git a/frontend/src/app/components/tx-features/tx-features.component.ts b/frontend/src/app/components/tx-features/tx-features.component.ts index 8f7d30b12..9376a0c7c 100644 --- a/frontend/src/app/components/tx-features/tx-features.component.ts +++ b/frontend/src/app/components/tx-features/tx-features.component.ts @@ -21,12 +21,19 @@ export class TxFeaturesComponent implements OnChanges { isRbfTransaction: boolean; isTaproot: boolean; + segwitEnabled: boolean; + rbfEnabled: boolean; + taprootEnabled: boolean; + constructor() { } ngOnChanges() { if (!this.tx) { return; } + this.segwitEnabled = !this.tx.status.confirmed || this.tx.status.block_height >= 477120; + this.taprootEnabled = !this.tx.status.confirmed || this.tx.status.block_height >= 709632; + this.rbfEnabled = !this.tx.status.confirmed || this.tx.status.block_height > 399700; this.segwitGains = calcSegwitFeeGains(this.tx); this.isRbfTransaction = this.tx.vin.some((v) => v.sequence < 0xfffffffe); this.isTaproot = this.tx.vin.some((v) => v.prevout && v.prevout.scriptpubkey_type === 'v1_p2tr'); From 070ee10fb063677cddb0cc930adac88d020b57e0 Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 13 Mar 2023 17:08:27 +0900 Subject: [PATCH 05/60] Fixing more missing i18n keys fixes #3339 fixes #3337 --- .../pool-ranking/pool-ranking.component.ts | 13 ++-- .../nodes-per-country-chart.component.ts | 10 +-- .../nodes-per-isp-chart.component.ts | 10 +-- .../lightning-statistics-chart.component.ts | 2 +- frontend/src/locale/messages.xlf | 62 +++++++++++++++---- 5 files changed, 71 insertions(+), 26 deletions(-) diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts index 0f2103024..a5349ee7c 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts @@ -162,10 +162,10 @@ export class PoolRankingComponent implements OnInit { if (this.miningWindowPreference === '24h') { return `${pool.name} (${pool.share}%)
` + pool.lastEstimatedHashrate.toString() + ' PH/s' + - `
` + $localize`${i} blocks`; + `
` + $localize`:@@1bb6965f8e1bbe40c076528ffd841da86f57f119:${ i }:INTERPOLATION: blocks`; } else { return `${pool.name} (${pool.share}%)
` + - $localize`${i} blocks`; + $localize`:@@1bb6965f8e1bbe40c076528ffd841da86f57f119:${ i }:INTERPOLATION: blocks`; } } }, @@ -195,13 +195,14 @@ export class PoolRankingComponent implements OnInit { }, borderColor: '#000', formatter: () => { + const percentage = totalShareOther.toFixed(2) + '%'; if (this.miningWindowPreference === '24h') { - return `${'Other'} (${totalShareOther.toFixed(2)}%)
` + + return `` + $localize`Other (${percentage})` + `
` + totalEstimatedHashrateOther.toString() + ' PH/s' + - `
` + totalBlockOther.toString() + ` blocks`; + `
` + $localize`:@@1bb6965f8e1bbe40c076528ffd841da86f57f119:${ totalBlockOther.toString() }:INTERPOLATION: blocks`; } else { - return `${'Other'} (${totalShareOther.toFixed(2)}%)
` + - totalBlockOther.toString() + ` blocks`; + return `` + $localize`Other (${percentage})` + `
` + + $localize`:@@1bb6965f8e1bbe40c076528ffd841da86f57f119:${ totalBlockOther.toString() }:INTERPOLATION: blocks`; } } }, diff --git a/frontend/src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts b/frontend/src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts index 681688842..b4621d7bf 100644 --- a/frontend/src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts +++ b/frontend/src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts @@ -99,8 +99,9 @@ export class NodesPerCountryChartComponent implements OnInit { }, borderColor: '#000', formatter: () => { + const nodeCount = country.count.toString(); return `${country.name.en} (${country.share}%)
` + - $localize`${country.count.toString()} nodes` + `
` + + $localize`${nodeCount} nodes` + `
` + $localize`${this.amountShortenerPipe.transform(country.capacity / 100000000, 2)} BTC capacity` ; } @@ -115,7 +116,7 @@ export class NodesPerCountryChartComponent implements OnInit { color: 'grey', }, value: totalShareOther, - name: 'Other' + (this.isMobile() ? `` : ` (${totalShareOther.toFixed(2)}%)`), + name: $localize`Other (${totalShareOther.toFixed(2) + '%'})`, label: { overflow: 'truncate', color: '#b1b1b1', @@ -131,8 +132,9 @@ export class NodesPerCountryChartComponent implements OnInit { }, borderColor: '#000', formatter: () => { - return `${'Other'} (${totalShareOther.toFixed(2)}%)
` + - totalNodeOther.toString() + ` nodes`; + const nodeCount = totalNodeOther.toString(); + return `` + $localize`Other (${totalShareOther.toFixed(2) + '%'})` + `
` + + $localize`${nodeCount} nodes`; }, }, data: 9999 as any diff --git a/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts b/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts index caaa350d6..614704ed6 100644 --- a/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts +++ b/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -153,8 +153,9 @@ export class NodesPerISPChartComponent implements OnInit { }, borderColor: '#000', formatter: () => { + const nodeCount = isp[4].toString(); return `${isp[1]} (${this.sortBy === 'capacity' ? isp[7] : isp[6]}%)
` + - $localize`${isp[4].toString()} nodes` + `
` + + $localize`${nodeCount} nodes` + `
` + $localize`${this.amountShortenerPipe.transform(isp[2] / 100000000, 2)} BTC` ; } @@ -169,7 +170,7 @@ export class NodesPerISPChartComponent implements OnInit { color: 'grey', }, value: totalShareOther, - name: 'Other' + (isMobile() || this.widget ? `` : ` (${totalShareOther.toFixed(2)}%)`), + name: $localize`Other (${totalShareOther.toFixed(2) + '%'})`, label: { overflow: 'truncate', color: '#b1b1b1', @@ -185,8 +186,9 @@ export class NodesPerISPChartComponent implements OnInit { }, borderColor: '#000', formatter: () => { - return `Other (${totalShareOther.toFixed(2)}%)
` + - $localize`${nodeCountOther.toString()} nodes` + `
` + + const nodeCount = nodeCountOther.toString(); + return `` + $localize`Other (${totalShareOther.toFixed(2) + '%'})` + `
` + + $localize`${nodeCount} nodes` + `
` + $localize`${this.amountShortenerPipe.transform(capacityOther / 100000000, 2)} BTC`; } }, diff --git a/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts b/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts index b93ee1f3d..dd034eabd 100644 --- a/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts +++ b/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts @@ -256,7 +256,7 @@ export class LightningStatisticsChartComponent implements OnInit { series: data.channel_count.length === 0 ? [] : [ { zlevel: 1, - name: 'Channels', + name: $localize`:@@807cf11e6ac1cde912496f764c176bdfdd6b7e19:Channels`, showSymbol: false, symbol: 'none', data: data.channel_count, diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index 3e1521b92..b74f94c26 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -2919,6 +2919,22 @@ src/app/components/mempool-blocks/mempool-blocks.component.html 35,36 + + src/app/components/pool-ranking/pool-ranking.component.ts + 165,163 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 168,167 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 202,200 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205,204 + src/app/lightning/channel/channel-box/channel-box.component.html 78 @@ -3709,15 +3725,31 @@ 58 - - blocks + + Other () src/app/components/pool-ranking/pool-ranking.component.ts - 165,163 + 200 src/app/components/pool-ranking/pool-ranking.component.ts - 168,167 + 204 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 @@ -5802,6 +5834,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6242,25 +6278,29 @@ lightning.share - nodes + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 BTC capacity src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6366,11 +6406,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 From cfdbd30956ff711124c3a463b9faf8a2afd9c1c0 Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 13 Mar 2023 17:18:09 +0900 Subject: [PATCH 06/60] Correct video height on mobile #3342 --- frontend/src/app/components/about/about.component.scss | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/components/about/about.component.scss b/frontend/src/app/components/about/about.component.scss index e538d724b..f2d4328b7 100644 --- a/frontend/src/app/components/about/about.component.scss +++ b/frontend/src/app/components/about/about.component.scss @@ -42,9 +42,11 @@ video { width: 640px; - height: 360px; max-width: 90%; margin-top: 0; + @media (min-width: 768px) { + height: 360px; + } } .social-icons { @@ -57,9 +59,13 @@ .enterprise-sponsor, .community-integrations-sponsor, .maintainers { - margin-top: 68px; + margin-top: 30px; margin-bottom: 68px; scroll-margin: 30px; + + @media (min-width: 768px) { + margin-top: 68px; + } } .maintainers { From ecfb980e759bf18d498eac69cb5c697ecf38d253 Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Mon, 13 Mar 2023 17:24:23 +0900 Subject: [PATCH 07/60] Disable pool update when running lightning only --- backend/src/tasks/pools-updater.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/tasks/pools-updater.ts b/backend/src/tasks/pools-updater.ts index dc76382d6..fb86d03be 100644 --- a/backend/src/tasks/pools-updater.ts +++ b/backend/src/tasks/pools-updater.ts @@ -17,7 +17,9 @@ class PoolsUpdater { treeUrl: string = config.MEMPOOL.POOLS_JSON_TREE_URL; public async updatePoolsJson(): Promise { - if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) { + if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false || + config.MEMPOOL.ENABLED === false + ) { return; } From d015ee78240ed5327723808f8d0a7df18aa4206a Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 13 Mar 2023 17:40:17 +0900 Subject: [PATCH 08/60] Fixes i18n string error --- .../pool-ranking/pool-ranking.component.ts | 9 +++-- frontend/src/locale/messages.xlf | 39 ++++++++++--------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts index a5349ee7c..ea3a52e8e 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts @@ -162,10 +162,10 @@ export class PoolRankingComponent implements OnInit { if (this.miningWindowPreference === '24h') { return `${pool.name} (${pool.share}%)
` + pool.lastEstimatedHashrate.toString() + ' PH/s' + - `
` + $localize`:@@1bb6965f8e1bbe40c076528ffd841da86f57f119:${ i }:INTERPOLATION: blocks`; + `
` + $localize`${ i }:INTERPOLATION: blocks`; } else { return `${pool.name} (${pool.share}%)
` + - $localize`:@@1bb6965f8e1bbe40c076528ffd841da86f57f119:${ i }:INTERPOLATION: blocks`; + $localize`${ i }:INTERPOLATION: blocks`; } } }, @@ -196,13 +196,14 @@ export class PoolRankingComponent implements OnInit { borderColor: '#000', formatter: () => { const percentage = totalShareOther.toFixed(2) + '%'; + const i = totalBlockOther.toString(); if (this.miningWindowPreference === '24h') { return `` + $localize`Other (${percentage})` + `
` + totalEstimatedHashrateOther.toString() + ' PH/s' + - `
` + $localize`:@@1bb6965f8e1bbe40c076528ffd841da86f57f119:${ totalBlockOther.toString() }:INTERPOLATION: blocks`; + `
` + $localize`${ i }:INTERPOLATION: blocks`; } else { return `` + $localize`Other (${percentage})` + `
` + - $localize`:@@1bb6965f8e1bbe40c076528ffd841da86f57f119:${ totalBlockOther.toString() }:INTERPOLATION: blocks`; + $localize`${ i }:INTERPOLATION: blocks`; } } }, diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index b74f94c26..0fd5bdcd7 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -2919,22 +2919,6 @@ src/app/components/mempool-blocks/mempool-blocks.component.html 35,36 - - src/app/components/pool-ranking/pool-ranking.component.ts - 165,163 - - - src/app/components/pool-ranking/pool-ranking.component.ts - 168,167 - - - src/app/components/pool-ranking/pool-ranking.component.ts - 202,200 - - - src/app/components/pool-ranking/pool-ranking.component.ts - 205,204 - src/app/lightning/channel/channel-box/channel-box.component.html 78 @@ -3725,15 +3709,34 @@ 58 + + blocks + + src/app/components/pool-ranking/pool-ranking.component.ts + 165,163 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 168,167 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + Other () src/app/components/pool-ranking/pool-ranking.component.ts - 200 + 201 src/app/components/pool-ranking/pool-ranking.component.ts - 204 + 205 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts From 0b88d94573abaa194424c4f1bf6613c732cf3dd8 Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 13 Mar 2023 18:42:43 +0900 Subject: [PATCH 09/60] Fix channels i18n string on world map fixes #3336 --- frontend/src/app/lightning/nodes-map/nodes-map.component.ts | 4 ++-- frontend/src/locale/messages.xlf | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/lightning/nodes-map/nodes-map.component.ts b/frontend/src/app/lightning/nodes-map/nodes-map.component.ts index db13ca6fe..e0fd80a53 100644 --- a/frontend/src/app/lightning/nodes-map/nodes-map.component.ts +++ b/frontend/src/app/lightning/nodes-map/nodes-map.component.ts @@ -207,8 +207,8 @@ export class NodesMap implements OnInit, OnChanges { return ` ${alias}
- ${liquidity}
- ${data[5]} channels
+ ${liquidity}
` + + $localize`:@@205c1b86ac1cc419c4d0cca51fdde418c4ffdc20:${data[5]}:INTERPOLATION: channels` + `
${getFlagEmoji(data[7])} ${data[6]} `; } diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index 0fd5bdcd7..be88e0b2e 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -5179,6 +5179,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels From 9f453decebf1efc37c4b09e67d88d18f05889bc9 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Tue, 14 Mar 2023 13:02:50 +0900 Subject: [PATCH 10/60] Use network-specific feature activation dates --- frontend/src/app/bitcoin.utils.ts | 27 +++++++++++++++++++ .../transaction/transaction.component.ts | 7 ++--- .../tx-features/tx-features.component.ts | 13 +++++---- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/frontend/src/app/bitcoin.utils.ts b/frontend/src/app/bitcoin.utils.ts index 25432565c..5419464a9 100644 --- a/frontend/src/app/bitcoin.utils.ts +++ b/frontend/src/app/bitcoin.utils.ts @@ -254,3 +254,30 @@ export function selectPowerOfTen(val: number): { divider: number, unit: string } return selectedPowerOfTen; } + +const featureActivation = { + mainnet: { + rbf: 399701, + segwit: 477120, + taproot: 709632, + }, + testnet: { + rbf: 720255, + segwit: 872730, + taproot: 2032291, + }, + signet: { + rbf: 0, + segwit: 0, + taproot: 0, + }, +}; + +export function isFeatureActive(network: string, height: number, feature: 'rbf' | 'segwit' | 'taproot'): boolean { + const activationHeight = featureActivation[network || 'mainnet']?.[feature]; + if (activationHeight != null) { + return height >= activationHeight; + } else { + return false; + } +} diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index c60d796e4..5f23633bf 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -23,6 +23,7 @@ import { BlockExtended, CpfpInfo } from '../../interfaces/node-api.interface'; import { LiquidUnblinding } from './liquid-ublinding'; import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe'; import { Price, PriceService } from '../../services/price.service'; +import { isFeatureActive } from '../../bitcoin.utils'; @Component({ selector: 'app-transaction', @@ -438,9 +439,9 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { setFeatures(): void { if (this.tx) { - this.segwitEnabled = !this.tx.status.confirmed || this.tx.status.block_height >= 477120; - this.taprootEnabled = !this.tx.status.confirmed || this.tx.status.block_height >= 709632; - this.rbfEnabled = !this.tx.status.confirmed || this.tx.status.block_height > 399700; + this.segwitEnabled = !this.tx.status.confirmed || isFeatureActive(this.stateService.network, this.tx.status.block_height, 'segwit'); + this.taprootEnabled = !this.tx.status.confirmed || isFeatureActive(this.stateService.network, this.tx.status.block_height, 'taproot'); + this.rbfEnabled = !this.tx.status.confirmed || isFeatureActive(this.stateService.network, this.tx.status.block_height, 'rbf'); } else { this.segwitEnabled = false; this.taprootEnabled = false; diff --git a/frontend/src/app/components/tx-features/tx-features.component.ts b/frontend/src/app/components/tx-features/tx-features.component.ts index 9376a0c7c..ffc2f291d 100644 --- a/frontend/src/app/components/tx-features/tx-features.component.ts +++ b/frontend/src/app/components/tx-features/tx-features.component.ts @@ -1,6 +1,7 @@ import { Component, ChangeDetectionStrategy, OnChanges, Input } from '@angular/core'; -import { calcSegwitFeeGains } from '../../bitcoin.utils'; +import { calcSegwitFeeGains, isFeatureActive } from '../../bitcoin.utils'; import { Transaction } from '../../interfaces/electrs.interface'; +import { StateService } from '../../services/state.service'; @Component({ selector: 'app-tx-features', @@ -25,15 +26,17 @@ export class TxFeaturesComponent implements OnChanges { rbfEnabled: boolean; taprootEnabled: boolean; - constructor() { } + constructor( + private stateService: StateService, + ) { } ngOnChanges() { if (!this.tx) { return; } - this.segwitEnabled = !this.tx.status.confirmed || this.tx.status.block_height >= 477120; - this.taprootEnabled = !this.tx.status.confirmed || this.tx.status.block_height >= 709632; - this.rbfEnabled = !this.tx.status.confirmed || this.tx.status.block_height > 399700; + this.segwitEnabled = !this.tx.status.confirmed || isFeatureActive(this.stateService.network, this.tx.status.block_height, 'segwit'); + this.taprootEnabled = !this.tx.status.confirmed || isFeatureActive(this.stateService.network, this.tx.status.block_height, 'taproot'); + this.rbfEnabled = !this.tx.status.confirmed || isFeatureActive(this.stateService.network, this.tx.status.block_height, 'rbf'); this.segwitGains = calcSegwitFeeGains(this.tx); this.isRbfTransaction = this.tx.vin.some((v) => v.sequence < 0xfffffffe); this.isTaproot = this.tx.vin.some((v) => v.prevout && v.prevout.scriptpubkey_type === 'v1_p2tr'); From 2b9e63dbc58a2c9c5064675afc266acf203cfda2 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 14 Mar 2023 14:31:20 +0900 Subject: [PATCH 11/60] i18n: Enable Danish --- frontend/angular.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/angular.json b/frontend/angular.json index d157cc443..792f59443 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -38,6 +38,10 @@ "translation": "src/locale/messages.de.xlf", "baseHref": "/de/" }, + "da": { + "translation": "src/locale/messages.da.xlf", + "baseHref": "/da/" + }, "es": { "translation": "src/locale/messages.es.xlf", "baseHref": "/es/" From 881af309abc80543d4124c834acaf7fbfc0be5c1 Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 14 Mar 2023 14:54:49 +0900 Subject: [PATCH 12/60] Pull from transifex --- frontend/src/locale/messages.ar.xlf | 606 +++++++----- frontend/src/locale/messages.cs.xlf | 628 +++++++----- frontend/src/locale/messages.da.xlf | 479 +++++---- frontend/src/locale/messages.de.xlf | 105 +- frontend/src/locale/messages.es.xlf | 451 ++++++--- frontend/src/locale/messages.fa.xlf | 621 +++++++----- frontend/src/locale/messages.fi.xlf | 447 ++++++--- frontend/src/locale/messages.fr.xlf | 465 ++++++--- frontend/src/locale/messages.he.xlf | 447 ++++++--- frontend/src/locale/messages.hu.xlf | 788 +++++++++------ frontend/src/locale/messages.it.xlf | 771 +++++++++------ frontend/src/locale/messages.ja.xlf | 126 ++- frontend/src/locale/messages.ka.xlf | 606 +++++++----- frontend/src/locale/messages.ko.xlf | 605 +++++++----- frontend/src/locale/messages.lt.xlf | 105 +- frontend/src/locale/messages.mk.xlf | 107 +- frontend/src/locale/messages.nb.xlf | 606 +++++++----- frontend/src/locale/messages.ne.xlf | 1334 +++++++++++++++---------- frontend/src/locale/messages.nl.xlf | 607 +++++++----- frontend/src/locale/messages.pl.xlf | 108 ++- frontend/src/locale/messages.pt.xlf | 105 +- frontend/src/locale/messages.ro.xlf | 607 +++++++----- frontend/src/locale/messages.ru.xlf | 606 +++++++----- frontend/src/locale/messages.sl.xlf | 1330 +++++++++++++++---------- frontend/src/locale/messages.th.xlf | 1335 +++++++++++++++---------- frontend/src/locale/messages.tr.xlf | 1402 +++++++++++++++++---------- frontend/src/locale/messages.uk.xlf | 606 +++++++----- frontend/src/locale/messages.vi.xlf | 606 +++++++----- frontend/src/locale/messages.zh.xlf | 606 +++++++----- 29 files changed, 10873 insertions(+), 6342 deletions(-) diff --git a/frontend/src/locale/messages.ar.xlf b/frontend/src/locale/messages.ar.xlf index 98e8c44c6..6c00d6e07 100644 --- a/frontend/src/locale/messages.ar.xlf +++ b/frontend/src/locale/messages.ar.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1074,7 +1074,7 @@ src/app/components/transaction/transaction.component.html - 282,284 + 283,285 transaction.version @@ -1202,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 256,261 + 257,262 src/app/components/transaction/transaction.component.html - 400,406 + 401,407 transaction.details @@ -1223,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 243,247 + 244,248 src/app/components/transaction/transaction.component.html - 371,377 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1245,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 244,243 + 246,245 @@ -1487,7 +1487,7 @@ التحالفات المجتمعية src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ مترجمو المشروع src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ المساهمون في المشروع src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ أعضاء المشروع src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ فريق صيانة المشروع src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -1581,7 +1581,7 @@ src/app/components/amount/amount.component.html - 20,23 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -2044,7 +2044,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2093,7 +2093,7 @@ src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2114,7 +2114,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2155,7 +2155,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2181,7 +2181,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/transactions-list/transactions-list.component.html @@ -2203,7 +2203,7 @@ src/app/components/transaction/transaction.component.html - 475,477 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2297,11 +2297,11 @@ src/app/components/transaction/transaction.component.html - 477,480 + 478,481 src/app/components/transaction/transaction.component.html - 488,490 + 489,491 src/app/components/transactions-list/transactions-list.component.html @@ -2331,7 +2331,7 @@ src/app/components/transaction/transaction.component.html - 268,271 + 269,272 Transaction Virtual Size transaction.vsize @@ -2407,7 +2407,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2448,7 +2448,7 @@ src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2465,7 +2465,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2506,7 +2506,7 @@ src/app/components/transaction/transaction.component.html - 264,266 + 265,267 src/app/dashboard/dashboard.component.html @@ -2534,7 +2534,7 @@ src/app/components/transaction/transaction.component.html - 272,274 + 273,275 @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2846,11 +2850,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2891,7 +2895,7 @@ src/app/components/transaction/transaction.component.html - 248,253 + 249,254 src/app/lightning/channel/channel.component.html @@ -3080,13 +3084,17 @@ Difficulty Adjustment تعديل الصعوبة + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3094,11 +3102,11 @@ Remaining متبقي - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3115,11 @@ blocks كتل - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3132,11 +3140,11 @@ block كتله - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3149,11 +3157,11 @@ Estimate متوقعة - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3162,20 +3170,24 @@ Previous السابق - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period الفترة الحالية - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3184,11 +3196,99 @@ Next Halving الانقسام التالي - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) إما ضعف الحد الأدنى أو معدل الأولوية المنخفضة (أيهما أقل) @@ -3346,7 +3446,7 @@ التعدين src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3355,7 +3455,7 @@ ترتيب التجمعات src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3368,7 +3468,7 @@ هيمنة التجمعات src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3381,7 +3481,7 @@ معدل التجزئة & معدل الصعوبة src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3390,7 +3490,7 @@ البرق src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3399,7 +3499,7 @@ أنواد برق لكل شبكة src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3420,7 +3520,7 @@ سعة شبكة البرق src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3441,7 +3541,7 @@ شبكات البرق حسب مزود خدمة انترنت src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3454,7 +3554,7 @@ شبكات البرق حسب الدولة src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3471,7 +3571,7 @@ أنواد البرق على خريطة العالم src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3488,7 +3588,7 @@ قنوات البرق على خريطة العالم src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3509,11 +3609,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3543,11 +3643,11 @@ (متوسط) معدل التجزئة src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3667,7 +3767,7 @@ إحصائيات المكافأة src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3676,7 +3776,7 @@ (١٤٤ كتله) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3685,7 +3785,7 @@ احدث الكتل src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3698,7 +3798,7 @@ التعديلات src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3707,7 +3807,7 @@ بث معاملة src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3882,9 +3982,8 @@ 58 - - blocks - كتل + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3893,6 +3992,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4115,7 +4249,7 @@ src/app/components/transaction/transaction.component.html - 290,291 + 291,292 transaction.hex @@ -4339,7 +4473,7 @@ تصفية src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4348,7 +4482,7 @@ عكس src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4357,7 +4491,7 @@ حجم التحويلات في الثانية (بايت افتراضي/ثانية) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4365,196 +4499,187 @@ Just now الآن - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago منذ - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After بعد - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - خلال ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4688,7 +4813,7 @@ src/app/components/transaction/transaction.component.html - 340,344 + 341,345 Transaction flow transaction.flow @@ -4707,7 +4832,7 @@ اعرض المزيد src/app/components/transaction/transaction.component.html - 225,227 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4724,7 +4849,7 @@ قلل العرض src/app/components/transaction/transaction.component.html - 227,233 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4737,7 +4862,7 @@ اعرض الرسم االبياني src/app/components/transaction/transaction.component.html - 247,248 + 248,249 show-diagram @@ -4746,7 +4871,7 @@ وقت القفل src/app/components/transaction/transaction.component.html - 286,288 + 287,289 transaction.locktime @@ -4755,7 +4880,7 @@ الحوالة غير موجودة. src/app/components/transaction/transaction.component.html - 449,450 + 450,451 transaction.error.transaction-not-found @@ -4764,7 +4889,7 @@ في انتظار ظهورها على mempool src/app/components/transaction/transaction.component.html - 450,455 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4773,7 +4898,7 @@ معدل الرسوم الفعلي src/app/components/transaction/transaction.component.html - 485,488 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -5227,6 +5352,10 @@ src/app/docs/api-docs/api-docs.component.html 13 + + src/app/docs/api-docs/api-docs.component.html + 14 + faq.big-disclaimer @@ -5234,7 +5363,7 @@ اعادة تشغيل خادم API src/app/docs/api-docs/api-docs.component.html - 41,42 + 42,43 api-docs.title @@ -5243,11 +5372,11 @@ نقطة النهاية src/app/docs/api-docs/api-docs.component.html - 50,51 + 51,52 src/app/docs/api-docs/api-docs.component.html - 104,107 + 105,108 Api docs endpoint @@ -5256,11 +5385,11 @@ وصف src/app/docs/api-docs/api-docs.component.html - 69,70 + 70,71 src/app/docs/api-docs/api-docs.component.html - 108,109 + 109,110 @@ -5268,7 +5397,7 @@ الدفع الإعتيادي:إجراء:أريد, بيانات:[’الكتل’،...]لتحدديد ما تريد دفعه.متوفر:كتل،;كتل عقود للعمليات غير المعلنة،جدول-2h-مباشر،وإحصاءات .دفع المعاملات المرتبطة بالعنوان:’إتبع-عنوان’: ’3PbJ...bF98’للحصول على معاملة جديدة تحتوي ذلك العنوان كإدخال و إخراج. إرجاع مصفوف المعاملات.عنوان المعاملاتلكتل العقود غير المعلنة الجديدة، و معاملات الكتللالمعاملات المؤكدة في الكتل الجديدة. src/app/docs/api-docs/api-docs.component.html - 109,110 + 110,111 api-docs.websocket.websocket @@ -5443,6 +5572,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5557,6 +5690,14 @@ src/app/lightning/channels-list/channels-list.component.html 43,46 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 + src/app/lightning/node-statistics/node-statistics.component.html 4,5 @@ -5675,7 +5816,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5815,7 +5956,7 @@ ساتوشي src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6075,6 +6216,14 @@ src/app/lightning/group/group.component.html 40,44 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 + src/app/lightning/node-statistics/node-statistics.component.html 28,29 @@ -6123,6 +6272,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6598,19 +6751,22 @@ lightning.share - nodes - أنواد + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6618,7 +6774,7 @@ سعة BTC src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6736,11 +6892,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.cs.xlf b/frontend/src/locale/messages.cs.xlf index 304f3fba4..fb249f4a1 100644 --- a/frontend/src/locale/messages.cs.xlf +++ b/frontend/src/locale/messages.cs.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1074,7 +1074,7 @@ src/app/components/transaction/transaction.component.html - 282,284 + 283,285 transaction.version @@ -1202,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 256,261 + 257,262 src/app/components/transaction/transaction.component.html - 400,406 + 401,407 transaction.details @@ -1223,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 243,247 + 244,248 src/app/components/transaction/transaction.component.html - 371,377 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1245,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 244,243 + 246,245 @@ -1487,7 +1487,7 @@ Komunitní aliance src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Překladatelé projektu src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Přispěvatelé projektu src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Členové projektu src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Správci projektu src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -1581,7 +1581,7 @@ src/app/components/amount/amount.component.html - 20,23 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -2044,7 +2044,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2093,7 +2093,7 @@ src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2114,7 +2114,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2155,7 +2155,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2181,7 +2181,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/transactions-list/transactions-list.component.html @@ -2203,7 +2203,7 @@ src/app/components/transaction/transaction.component.html - 475,477 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2297,11 +2297,11 @@ src/app/components/transaction/transaction.component.html - 477,480 + 478,481 src/app/components/transaction/transaction.component.html - 488,490 + 489,491 src/app/components/transactions-list/transactions-list.component.html @@ -2331,7 +2331,7 @@ src/app/components/transaction/transaction.component.html - 268,271 + 269,272 Transaction Virtual Size transaction.vsize @@ -2407,7 +2407,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2448,7 +2448,7 @@ src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2465,7 +2465,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2506,7 +2506,7 @@ src/app/components/transaction/transaction.component.html - 264,266 + 265,267 src/app/dashboard/dashboard.component.html @@ -2534,11 +2534,12 @@ src/app/components/transaction/transaction.component.html - 272,274 + 273,275 Size per weight + Velikost dle váhy src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts 200,199 @@ -2632,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2745,6 +2750,7 @@ Subsidy + fees + Vytěžené + poplatky src/app/components/block/block.component.html 153,156 @@ -2844,11 +2850,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2889,7 +2895,7 @@ src/app/components/transaction/transaction.component.html - 248,253 + 249,254 src/app/lightning/channel/channel.component.html @@ -3078,13 +3084,17 @@ Difficulty Adjustment Změna obtížnosti + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3092,11 +3102,11 @@ Remaining Zbývá - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3105,11 +3115,11 @@ blocks bloky - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3130,11 +3140,11 @@ block blok - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3147,11 +3157,11 @@ Estimate Odhad - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3160,20 +3170,24 @@ Previous Předchozí - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Současné období - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3182,11 +3196,99 @@ Next Halving Další půlení - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) Buď dvojnásobek minimální sazby, nebo sazba Nízká priorita (podle toho, která je nižší). @@ -3344,7 +3446,7 @@ Těžba src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3353,7 +3455,7 @@ Hodnocení poolů src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3366,7 +3468,7 @@ Dominance poolů src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3379,7 +3481,7 @@ Hashrate & obtížnost src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3388,7 +3490,7 @@ Lightning src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3397,7 +3499,7 @@ Lightning uzly v síti src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3418,7 +3520,7 @@ Kapacita Lightning sítě src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3439,7 +3541,7 @@ Lightning uzly na jednoho ISP src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3452,7 +3554,7 @@ Lightning uzly podle zemí src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3469,7 +3571,7 @@ Světová mapa Lightning uzlů src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3486,7 +3588,7 @@ Světová mapa kanálů Lightning uzlů src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3507,11 +3609,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3541,11 +3643,11 @@ Hashrate (KP) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3665,7 +3767,7 @@ Statistiky odměn src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3674,7 +3776,7 @@ (144 bloků) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3683,7 +3785,7 @@ Poslední bloky src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3696,7 +3798,7 @@ Úpravy src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3705,7 +3807,7 @@ Vyslat transakci src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3825,6 +3927,7 @@ Avg Health + Průměrné zdraví src/app/components/pool-ranking/pool-ranking.component.html 96,97 @@ -3879,9 +3982,8 @@ 58 - - blocks - bloků + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3890,6 +3992,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4112,7 +4249,7 @@ src/app/components/transaction/transaction.component.html - 290,291 + 291,292 transaction.hex @@ -4239,6 +4376,7 @@ Bitcoin Block Height + Výška bitcoinového bloku src/app/components/search-form/search-results/search-results.component.html 3 @@ -4247,6 +4385,7 @@ Bitcoin Transaction + Bitcoinová transakce src/app/components/search-form/search-results/search-results.component.html 9 @@ -4255,6 +4394,7 @@ Bitcoin Address + Bitcoinová adresa src/app/components/search-form/search-results/search-results.component.html 15 @@ -4263,6 +4403,7 @@ Bitcoin Block + Bitcoinový blok src/app/components/search-form/search-results/search-results.component.html 21 @@ -4271,6 +4412,7 @@ Bitcoin Addresses + Bitcoinové adresy src/app/components/search-form/search-results/search-results.component.html 27 @@ -4279,6 +4421,7 @@ Lightning Nodes + Lightningové uzly src/app/components/search-form/search-results/search-results.component.html 35 @@ -4287,6 +4430,7 @@ Lightning Channels + Lightningové kanály src/app/components/search-form/search-results/search-results.component.html 43 @@ -4329,7 +4473,7 @@ Filtr src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4338,7 +4482,7 @@ Převrátit src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4347,7 +4491,7 @@ Transakce vBytů za sekundu (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4355,196 +4499,188 @@ Just now Právě teď - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago před - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After Po - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - Za ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4678,7 +4814,7 @@ src/app/components/transaction/transaction.component.html - 340,344 + 341,345 Transaction flow transaction.flow @@ -4697,7 +4833,7 @@ Zobrazit více src/app/components/transaction/transaction.component.html - 225,227 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4714,7 +4850,7 @@ Zobrazit méně src/app/components/transaction/transaction.component.html - 227,233 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4727,7 +4863,7 @@ Zobrazit diagram src/app/components/transaction/transaction.component.html - 247,248 + 248,249 show-diagram @@ -4736,7 +4872,7 @@ Locktime src/app/components/transaction/transaction.component.html - 286,288 + 287,289 transaction.locktime @@ -4745,7 +4881,7 @@ Transakce nebyla nalezena. src/app/components/transaction/transaction.component.html - 449,450 + 450,451 transaction.error.transaction-not-found @@ -4754,7 +4890,7 @@ Čekání na to, až se objeví v mempoolu... src/app/components/transaction/transaction.component.html - 450,455 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4763,7 +4899,7 @@ Efektivní poplatek src/app/components/transaction/transaction.component.html - 485,488 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -5213,10 +5349,15 @@ mempool.space merely provides data about the Bitcoin network. It cannot help you with retrieving funds, confirming your transaction quicker, etc. + mempool.space pouze poskytuje údaje o Bitcoinové síti. Nemůže vám pomoci při získávání finančních prostředků, rychlejším potvrzování transakcí atd. src/app/docs/api-docs/api-docs.component.html 13 + + src/app/docs/api-docs/api-docs.component.html + 14 + faq.big-disclaimer @@ -5224,7 +5365,7 @@ Služba REST API src/app/docs/api-docs/api-docs.component.html - 41,42 + 42,43 api-docs.title @@ -5233,11 +5374,11 @@ Endpoint src/app/docs/api-docs/api-docs.component.html - 50,51 + 51,52 src/app/docs/api-docs/api-docs.component.html - 104,107 + 105,108 Api docs endpoint @@ -5246,11 +5387,11 @@ Popis src/app/docs/api-docs/api-docs.component.html - 69,70 + 70,71 src/app/docs/api-docs/api-docs.component.html - 108,109 + 109,110 @@ -5258,7 +5399,7 @@ Výchozí push: akce: 'want', data: ['blocks', ...] pro vyjádření toho, co chcete pushnout. K dispozici: blocks, mempool-blocks, live-2h-chart a stats. Push transakce související s adresou: 'track-address': '3PbJ...bF9B' pro příjem všech nových transakcí obsahujících tuto adresu jako vstup nebo výstup. Vrací pole transakcí. address-transactions pro nové transakce mempoolu a block-transactions pro nové transakce potvrzené blokem. src/app/docs/api-docs/api-docs.component.html - 109,110 + 110,111 api-docs.websocket.websocket @@ -5433,6 +5574,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5547,6 +5692,14 @@ src/app/lightning/channels-list/channels-list.component.html 43,46 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 + src/app/lightning/node-statistics/node-statistics.component.html 4,5 @@ -5665,7 +5818,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5706,6 +5859,7 @@ Mutually closed + Vzájemně uzavřeno src/app/lightning/channel/closing-type/closing-type.component.ts 20 @@ -5713,6 +5867,7 @@ Force closed + Uzavřeno vynuceně src/app/lightning/channel/closing-type/closing-type.component.ts 24 @@ -5720,6 +5875,7 @@ Force closed with penalty + Uzavřeno vynuceně s pokutou src/app/lightning/channel/closing-type/closing-type.component.ts 28 @@ -5803,7 +5959,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -5853,6 +6009,7 @@ avg + prům src/app/lightning/channels-statistics/channels-statistics.component.html 3,5 @@ -5861,6 +6018,7 @@ med + med src/app/lightning/channels-statistics/channels-statistics.component.html 6,9 @@ -6063,6 +6221,14 @@ src/app/lightning/group/group.component.html 40,44 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 + src/app/lightning/node-statistics/node-statistics.component.html 28,29 @@ -6111,6 +6277,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6243,6 +6413,7 @@ Outgoing Fees + Odchozí poplatky src/app/lightning/node-fee-chart/node-fee-chart.component.ts 170 @@ -6254,6 +6425,7 @@ Incoming Fees + Příchozí poplatky src/app/lightning/node-fee-chart/node-fee-chart.component.ts 178 @@ -6541,6 +6713,7 @@ Clearnet and Darknet + Clearnet a Darknet src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -6552,6 +6725,7 @@ Clearnet Only (IPv4, IPv6) + Pouze Clearnet (IPv4, IPv6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -6563,6 +6737,7 @@ Darknet Only (Tor, I2P, cjdns) + Pouze Darknet (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -6586,19 +6761,22 @@ lightning.share - nodes - uzlů + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6606,7 +6784,7 @@ BTC kapacita src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6724,11 +6902,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.da.xlf b/frontend/src/locale/messages.da.xlf index 29f667ed5..57f4c2cf4 100644 --- a/frontend/src/locale/messages.da.xlf +++ b/frontend/src/locale/messages.da.xlf @@ -487,7 +487,7 @@ Block : - Blok : + Blok : src/app/bisq/bisq-block/bisq-block.component.ts 89 @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1487,7 +1487,7 @@ Community alliancer src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Oversættere src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Bidragsydere src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Medlemmer src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Vedligeholdere src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -3080,13 +3084,17 @@ Difficulty Adjustment Sværhedsgrad justering + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3094,11 +3102,11 @@ Remaining Tilbage - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3115,11 @@ blocks blokke - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3132,11 +3140,11 @@ block blok - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3149,11 +3157,11 @@ Estimate Estimat - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3162,20 +3170,24 @@ Previous Forrige - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Nuværende periode - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3184,11 +3196,99 @@ Next Halving Næste Halvering - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) Enten 2x minimum eller lavprioritetssatsen (alt efter hvad der er lavest) @@ -3667,7 +3767,7 @@ Belønningsstatistik src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3676,7 +3776,7 @@ (144 blokke) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3685,7 +3785,7 @@ Seneste blokke src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3698,7 +3798,7 @@ Justeringer src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3707,7 +3807,7 @@ Udsend transaktion src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3882,9 +3982,9 @@ 58 - - blocks - blokke + + blocks + blokke src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3893,6 +3993,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4366,40 +4501,28 @@ Lige nu src/app/components/time/time.component.ts - 78 + 79 ago siden - - src/app/components/time/time.component.ts - 97 - - - src/app/components/time/time.component.ts - 98 - - - src/app/components/time/time.component.ts - 99 - - - src/app/components/time/time.component.ts - 100 - - - src/app/components/time/time.component.ts - 101 - - - src/app/components/time/time.component.ts - 102 - src/app/components/time/time.component.ts 103 + + src/app/components/time/time.component.ts + 104 + + + src/app/components/time/time.component.ts + 105 + + + src/app/components/time/time.component.ts + 106 + src/app/components/time/time.component.ts 107 @@ -4412,54 +4535,54 @@ src/app/components/time/time.component.ts 109 - - src/app/components/time/time.component.ts - 110 - - - src/app/components/time/time.component.ts - 111 - - - src/app/components/time/time.component.ts - 112 - src/app/components/time/time.component.ts 113 + + src/app/components/time/time.component.ts + 114 + + + src/app/components/time/time.component.ts + 115 + + + src/app/components/time/time.component.ts + 116 + + + src/app/components/time/time.component.ts + 117 + + + src/app/components/time/time.component.ts + 118 + + + src/app/components/time/time.component.ts + 119 + In ~ Om ~ - - src/app/components/time/time.component.ts - 120 - - - src/app/components/time/time.component.ts - 121 - - - src/app/components/time/time.component.ts - 122 - - - src/app/components/time/time.component.ts - 123 - - - src/app/components/time/time.component.ts - 124 - - - src/app/components/time/time.component.ts - 125 - src/app/components/time/time.component.ts 126 + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + src/app/components/time/time.component.ts 130 @@ -4472,54 +4595,54 @@ src/app/components/time/time.component.ts 132 - - src/app/components/time/time.component.ts - 133 - - - src/app/components/time/time.component.ts - 134 - - - src/app/components/time/time.component.ts - 135 - src/app/components/time/time.component.ts 136 + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 + After Efter - - src/app/components/time/time.component.ts - 143 - - - src/app/components/time/time.component.ts - 144 - - - src/app/components/time/time.component.ts - 145 - - - src/app/components/time/time.component.ts - 146 - - - src/app/components/time/time.component.ts - 147 - - - src/app/components/time/time.component.ts - 148 - src/app/components/time/time.component.ts 149 + + src/app/components/time/time.component.ts + 150 + + + src/app/components/time/time.component.ts + 151 + + + src/app/components/time/time.component.ts + 152 + src/app/components/time/time.component.ts 153 @@ -4532,22 +4655,34 @@ src/app/components/time/time.component.ts 155 - - src/app/components/time/time.component.ts - 156 - - - src/app/components/time/time.component.ts - 157 - - - src/app/components/time/time.component.ts - 158 - src/app/components/time/time.component.ts 159 + + src/app/components/time/time.component.ts + 160 + + + src/app/components/time/time.component.ts + 161 + + + src/app/components/time/time.component.ts + 162 + + + src/app/components/time/time.component.ts + 163 + + + src/app/components/time/time.component.ts + 164 + + + src/app/components/time/time.component.ts + 165 + This transaction has been replaced by: @@ -5440,6 +5575,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5680,7 +5819,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5821,7 +5960,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6139,6 +6278,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6619,19 +6762,23 @@ lightning.share - nodes - noder + nodes + noder src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6639,7 +6786,7 @@ BTC kapacitet src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6757,11 +6904,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 @@ -6879,7 +7026,7 @@ year - år + år src/app/shared/i18n/dates.ts 3 @@ -6887,7 +7034,7 @@ years - år + år src/app/shared/i18n/dates.ts 4 @@ -6895,7 +7042,7 @@ month - måned + måned src/app/shared/i18n/dates.ts 5 @@ -6903,7 +7050,7 @@ months - måneder + måneder src/app/shared/i18n/dates.ts 6 @@ -6911,7 +7058,7 @@ week - uge + uge src/app/shared/i18n/dates.ts 7 @@ -6919,7 +7066,7 @@ weeks - uger + uger src/app/shared/i18n/dates.ts 8 @@ -6927,7 +7074,7 @@ day - dag + dag src/app/shared/i18n/dates.ts 9 @@ -6935,7 +7082,7 @@ days - dage + dage src/app/shared/i18n/dates.ts 10 @@ -6943,7 +7090,7 @@ hour - time + time src/app/shared/i18n/dates.ts 11 @@ -6951,7 +7098,7 @@ hours - timer + timer src/app/shared/i18n/dates.ts 12 @@ -6959,7 +7106,7 @@ minute - minut + minut src/app/shared/i18n/dates.ts 13 @@ -6967,7 +7114,7 @@ minutes - minutter + minutter src/app/shared/i18n/dates.ts 14 @@ -6975,7 +7122,7 @@ second - sekund + sekund src/app/shared/i18n/dates.ts 15 @@ -6983,7 +7130,7 @@ seconds - sekunder + sekunder src/app/shared/i18n/dates.ts 16 diff --git a/frontend/src/locale/messages.de.xlf b/frontend/src/locale/messages.de.xlf index 398f4f60e..a78568ca1 100644 --- a/frontend/src/locale/messages.de.xlf +++ b/frontend/src/locale/messages.de.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1487,7 +1487,7 @@ Community-Allianzen src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Projektübersetzer src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Projektmitwirkende src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Projektmitglieder src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Projektbetreuer src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -3094,7 +3094,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3778,7 +3778,7 @@ Belohnungsstatistiken src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3787,7 +3787,7 @@ (144 Blöcke) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3796,7 +3796,7 @@ Neueste Blöcke src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3809,7 +3809,7 @@ Anpassungen src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3818,7 +3818,7 @@ Transaktion senden src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3993,9 +3993,8 @@ 58 - - blocks - Blocks + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -4004,6 +4003,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -5551,6 +5585,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5791,7 +5829,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5932,7 +5970,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6250,6 +6288,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6730,19 +6772,22 @@ lightning.share - nodes - Nodes + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6750,7 +6795,7 @@ BTC Kapazität src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6868,11 +6913,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.es.xlf b/frontend/src/locale/messages.es.xlf index 66437d4fb..e0cc2d847 100644 --- a/frontend/src/locale/messages.es.xlf +++ b/frontend/src/locale/messages.es.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1487,7 +1487,7 @@ Alianzas de la comunidad src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Traductores del proyecto src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Contribuyentes al proyecto src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Miembros del proyecto src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Mantenedores del proyecto src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -3080,13 +3084,17 @@ Difficulty Adjustment Ajuste de Dificultad + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3094,11 +3102,11 @@ Remaining Restante - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3115,11 @@ blocks bloques - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3132,11 +3140,11 @@ block bloque - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3149,11 +3157,11 @@ Estimate Estimada - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3162,20 +3170,24 @@ Previous Previo - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Período Actual - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3184,11 +3196,101 @@ Next Halving Siguiente halving - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + bloques minados + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + bloque minado + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) O bien 2x el mínimo, o la tasa de prioridad baja (lo que resulte menor) @@ -3667,7 +3769,7 @@ Estadísticas de recompensa src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3676,7 +3778,7 @@ (144 bloques) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3685,7 +3787,7 @@ Últimos bloques src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3698,7 +3800,7 @@ Ajustes src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3707,7 +3809,7 @@ Transmitir transacción src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3882,9 +3984,8 @@ 58 - - blocks - bloques + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3893,6 +3994,42 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + Otros () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4366,40 +4503,28 @@ Justo ahora src/app/components/time/time.component.ts - 78 + 79 ago atrás - - src/app/components/time/time.component.ts - 97 - - - src/app/components/time/time.component.ts - 98 - - - src/app/components/time/time.component.ts - 99 - - - src/app/components/time/time.component.ts - 100 - - - src/app/components/time/time.component.ts - 101 - - - src/app/components/time/time.component.ts - 102 - src/app/components/time/time.component.ts 103 + + src/app/components/time/time.component.ts + 104 + + + src/app/components/time/time.component.ts + 105 + + + src/app/components/time/time.component.ts + 106 + src/app/components/time/time.component.ts 107 @@ -4412,54 +4537,54 @@ src/app/components/time/time.component.ts 109 - - src/app/components/time/time.component.ts - 110 - - - src/app/components/time/time.component.ts - 111 - - - src/app/components/time/time.component.ts - 112 - src/app/components/time/time.component.ts 113 + + src/app/components/time/time.component.ts + 114 + + + src/app/components/time/time.component.ts + 115 + + + src/app/components/time/time.component.ts + 116 + + + src/app/components/time/time.component.ts + 117 + + + src/app/components/time/time.component.ts + 118 + + + src/app/components/time/time.component.ts + 119 + In ~ En ~ - - src/app/components/time/time.component.ts - 120 - - - src/app/components/time/time.component.ts - 121 - - - src/app/components/time/time.component.ts - 122 - - - src/app/components/time/time.component.ts - 123 - - - src/app/components/time/time.component.ts - 124 - - - src/app/components/time/time.component.ts - 125 - src/app/components/time/time.component.ts 126 + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + src/app/components/time/time.component.ts 130 @@ -4472,54 +4597,54 @@ src/app/components/time/time.component.ts 132 - - src/app/components/time/time.component.ts - 133 - - - src/app/components/time/time.component.ts - 134 - - - src/app/components/time/time.component.ts - 135 - src/app/components/time/time.component.ts 136 + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 + After Después - - src/app/components/time/time.component.ts - 143 - - - src/app/components/time/time.component.ts - 144 - - - src/app/components/time/time.component.ts - 145 - - - src/app/components/time/time.component.ts - 146 - - - src/app/components/time/time.component.ts - 147 - - - src/app/components/time/time.component.ts - 148 - src/app/components/time/time.component.ts 149 + + src/app/components/time/time.component.ts + 150 + + + src/app/components/time/time.component.ts + 151 + + + src/app/components/time/time.component.ts + 152 + src/app/components/time/time.component.ts 153 @@ -4532,22 +4657,34 @@ src/app/components/time/time.component.ts 155 - - src/app/components/time/time.component.ts - 156 - - - src/app/components/time/time.component.ts - 157 - - - src/app/components/time/time.component.ts - 158 - src/app/components/time/time.component.ts 159 + + src/app/components/time/time.component.ts + 160 + + + src/app/components/time/time.component.ts + 161 + + + src/app/components/time/time.component.ts + 162 + + + src/app/components/time/time.component.ts + 163 + + + src/app/components/time/time.component.ts + 164 + + + src/app/components/time/time.component.ts + 165 + This transaction has been replaced by: @@ -5440,6 +5577,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5680,7 +5821,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5821,7 +5962,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6139,6 +6280,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6619,19 +6764,23 @@ lightning.share - nodes - nodos + nodes + nodos src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6639,7 +6788,7 @@ capacidad BTC src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6757,11 +6906,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.fa.xlf b/frontend/src/locale/messages.fa.xlf index 4f11ea03e..e4bec8dbc 100644 --- a/frontend/src/locale/messages.fa.xlf +++ b/frontend/src/locale/messages.fa.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1074,7 +1074,7 @@ src/app/components/transaction/transaction.component.html - 282,284 + 283,285 transaction.version @@ -1202,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 256,261 + 257,262 src/app/components/transaction/transaction.component.html - 400,406 + 401,407 transaction.details @@ -1223,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 243,247 + 244,248 src/app/components/transaction/transaction.component.html - 371,377 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1245,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 244,243 + 246,245 @@ -1487,7 +1487,7 @@ متحدین جامعه src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ مترجم‌های پروژه src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ مشارکت کنندگان src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ اعضای پروژه src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ نگهدارندگان پروژه src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -1581,7 +1581,7 @@ src/app/components/amount/amount.component.html - 20,23 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -2044,7 +2044,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2093,7 +2093,7 @@ src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2114,7 +2114,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2155,7 +2155,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2181,7 +2181,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/transactions-list/transactions-list.component.html @@ -2203,7 +2203,7 @@ src/app/components/transaction/transaction.component.html - 475,477 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2297,11 +2297,11 @@ src/app/components/transaction/transaction.component.html - 477,480 + 478,481 src/app/components/transaction/transaction.component.html - 488,490 + 489,491 src/app/components/transactions-list/transactions-list.component.html @@ -2331,7 +2331,7 @@ src/app/components/transaction/transaction.component.html - 268,271 + 269,272 Transaction Virtual Size transaction.vsize @@ -2407,7 +2407,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2448,7 +2448,7 @@ src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2465,7 +2465,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2506,7 +2506,7 @@ src/app/components/transaction/transaction.component.html - 264,266 + 265,267 src/app/dashboard/dashboard.component.html @@ -2534,7 +2534,7 @@ src/app/components/transaction/transaction.component.html - 272,274 + 273,275 @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2846,11 +2850,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2891,7 +2895,7 @@ src/app/components/transaction/transaction.component.html - 248,253 + 249,254 src/app/lightning/channel/channel.component.html @@ -3080,13 +3084,17 @@ Difficulty Adjustment تنظیم سختی بلاک‌ها + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3094,11 +3102,11 @@ Remaining باقیمانده - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3115,11 @@ blocks بلاک - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3132,11 +3140,11 @@ block بلاک - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3149,11 +3157,11 @@ Estimate تخمین - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3162,20 +3170,24 @@ Previous قبلی - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period دوره فعلی - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3184,11 +3196,110 @@ Next Halving نصف‌شدن یارانهٔ بلاک بعدی - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + بلاک مورد انتظار + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + بلاک مورد انتظار + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + بلاک استخراج‌شده + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + بلاک استخراج‌شده + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + بلاک باقی‌مانده + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + بلاک باقی‌مانده + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + بلاک جلوتر از پیش‌بینی + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + بلاک جلوتر از پیش‌بینی + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + بلاک عقب‌تر از پیش‌بینی + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + بلاک عقب‌تر از پیش‌بینی + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + متوسط زمان ایجاد بلاک + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) «2 برابر نرخ کمینه» یا «اولویت پایین» (هر کدام که کمتر است) @@ -3346,7 +3457,7 @@ استخراج src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3355,7 +3466,7 @@ رتبه‌بندی استخرها src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3368,7 +3479,7 @@ سهم استخرها src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3381,7 +3492,7 @@ نرخ تولید هش و سختی src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3390,7 +3501,7 @@ لایتنینگ src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3399,7 +3510,7 @@ نسبت گره‌های لایتنینگ به شبکه src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3420,7 +3531,7 @@ ظرفیت شبکه لایتنینگ src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3441,7 +3552,7 @@ نسبت گره‌های لایتنینگ به ارائه کننده اینترنت src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3454,7 +3565,7 @@ نسبت گره‌های لایتنینگ به کشور src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3471,7 +3582,7 @@ نقشه گره‌های لایتنینگ دنیا src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3488,7 +3599,7 @@ نقشه کانال‌های گره‌های لایتنینگ دنیا src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3509,11 +3620,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3543,11 +3654,11 @@ نرخ تولید هش (میانگین متحرک) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3667,7 +3778,7 @@ وضعیت پاداش src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3676,7 +3787,7 @@ (144 بلاک) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3685,7 +3796,7 @@ آخرین بلاک‌ها src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3698,7 +3809,7 @@ تنظیم‌سختی‌ها src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3707,7 +3818,7 @@ انتشار تراکنش src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3882,9 +3993,9 @@ 58 - - blocks - بلاک + + blocks + بلاک src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3893,6 +4004,42 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + دیگر () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4115,7 +4262,7 @@ src/app/components/transaction/transaction.component.html - 290,291 + 291,292 transaction.hex @@ -4339,7 +4486,7 @@ پالایش src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4348,7 +4495,7 @@ معکوس src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4357,7 +4504,7 @@ تراکنش vByte بر ثانیه (vB بر ثانیه) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4365,196 +4512,188 @@ Just now همین الان - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago پیش - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + در حدود + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After بعد از - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - در حدود - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4688,7 +4827,7 @@ src/app/components/transaction/transaction.component.html - 340,344 + 341,345 Transaction flow transaction.flow @@ -4707,7 +4846,7 @@ بیشتر src/app/components/transaction/transaction.component.html - 225,227 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4724,7 +4863,7 @@ کمتر src/app/components/transaction/transaction.component.html - 227,233 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4737,7 +4876,7 @@ نمایش نمودار src/app/components/transaction/transaction.component.html - 247,248 + 248,249 show-diagram @@ -4746,7 +4885,7 @@ قفل‌زمانی src/app/components/transaction/transaction.component.html - 286,288 + 287,289 transaction.locktime @@ -4755,7 +4894,7 @@ تراکنش پیدا نشد. src/app/components/transaction/transaction.component.html - 449,450 + 450,451 transaction.error.transaction-not-found @@ -4764,7 +4903,7 @@ منتظر دیده‌شدن در mempool... src/app/components/transaction/transaction.component.html - 450,455 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4773,7 +4912,7 @@ نرخ کارمزد مؤثر src/app/components/transaction/transaction.component.html - 485,488 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -5228,6 +5367,10 @@ src/app/docs/api-docs/api-docs.component.html 13 + + src/app/docs/api-docs/api-docs.component.html + 14 + faq.big-disclaimer @@ -5235,7 +5378,7 @@ خدمات REST API src/app/docs/api-docs/api-docs.component.html - 41,42 + 42,43 api-docs.title @@ -5244,11 +5387,11 @@ نقطه اتصال src/app/docs/api-docs/api-docs.component.html - 50,51 + 51,52 src/app/docs/api-docs/api-docs.component.html - 104,107 + 105,108 Api docs endpoint @@ -5257,11 +5400,11 @@ توضیحات src/app/docs/api-docs/api-docs.component.html - 69,70 + 70,71 src/app/docs/api-docs/api-docs.component.html - 108,109 + 109,110 @@ -5269,7 +5412,7 @@ دستور پیش‌فرض: action: 'want', data: ['blocks', ...] که نشان می‌دهد چه چیزی باید ارسال شود. گزینه‌های در دسترس: blocks, mempool-blocks, live-2h-chart و stats. دستورهای مربوط به آدرس: 'track-address': '3PbJ...bF9B' جهت دریافت تمام تراکنش‌های جدیدی که خروجی یا ورودی‌های آنها شامل این آدرس می‌شود. آرایه‌ای از تراکنش‌ها برمی‌گرداند. address-transactions برای تراکنش‌های جدید ممپول و block-transactions برای تراکنش‌های بلاک تایید شده‌ی جدید. src/app/docs/api-docs/api-docs.component.html - 109,110 + 110,111 api-docs.websocket.websocket @@ -5444,6 +5587,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5558,6 +5705,14 @@ src/app/lightning/channels-list/channels-list.component.html 43,46 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 + src/app/lightning/node-statistics/node-statistics.component.html 4,5 @@ -5676,7 +5831,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5817,7 +5972,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6079,6 +6234,14 @@ src/app/lightning/group/group.component.html 40,44 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 + src/app/lightning/node-statistics/node-statistics.component.html 28,29 @@ -6127,6 +6290,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6607,19 +6774,23 @@ lightning.share - nodes - گره + nodes + گره src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6627,7 +6798,7 @@ ظرفیت BTC src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6745,11 +6916,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.fi.xlf b/frontend/src/locale/messages.fi.xlf index 44217e369..438fdde54 100644 --- a/frontend/src/locale/messages.fi.xlf +++ b/frontend/src/locale/messages.fi.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1487,7 +1487,7 @@ Yhteisöliittoumat src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Projektin kääntäjät src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Projektin avustajat src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Projektin jäsenet src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Projektin ylläpitäjät src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -3080,13 +3084,17 @@ Difficulty Adjustment Vaikeudensäätö + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3094,11 +3102,11 @@ Remaining Jäljellä - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3115,11 @@ blocks lohkoa - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3132,11 +3140,11 @@ block lohko - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3149,11 +3157,11 @@ Estimate Arvio - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3162,20 +3170,24 @@ Previous Edellinen - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Nykyinen jakso - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3184,11 +3196,99 @@ Next Halving Puoliintuminen - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) Joko 2x vähimmäismäärä tai alhaisen prioriteetin määrä (riippuen siitä, kumpi on alhaisempi) @@ -3667,7 +3767,7 @@ Palkkiotilastot src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3676,7 +3776,7 @@ (144 lohkoa) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3685,7 +3785,7 @@ Viimeisimmät lohkot src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3698,7 +3798,7 @@ Vaikeudensäädöt src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3707,7 +3807,7 @@ Siirtotapahtuman kuulutus src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3882,9 +3982,8 @@ 58 - - blocks - lohkoa + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3893,6 +3992,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4366,40 +4500,28 @@ Juuri nyt src/app/components/time/time.component.ts - 78 + 79 ago sitten - - src/app/components/time/time.component.ts - 97 - - - src/app/components/time/time.component.ts - 98 - - - src/app/components/time/time.component.ts - 99 - - - src/app/components/time/time.component.ts - 100 - - - src/app/components/time/time.component.ts - 101 - - - src/app/components/time/time.component.ts - 102 - src/app/components/time/time.component.ts 103 + + src/app/components/time/time.component.ts + 104 + + + src/app/components/time/time.component.ts + 105 + + + src/app/components/time/time.component.ts + 106 + src/app/components/time/time.component.ts 107 @@ -4412,53 +4534,53 @@ src/app/components/time/time.component.ts 109 - - src/app/components/time/time.component.ts - 110 - - - src/app/components/time/time.component.ts - 111 - - - src/app/components/time/time.component.ts - 112 - src/app/components/time/time.component.ts 113 + + src/app/components/time/time.component.ts + 114 + + + src/app/components/time/time.component.ts + 115 + + + src/app/components/time/time.component.ts + 116 + + + src/app/components/time/time.component.ts + 117 + + + src/app/components/time/time.component.ts + 118 + + + src/app/components/time/time.component.ts + 119 + In ~ - - src/app/components/time/time.component.ts - 120 - - - src/app/components/time/time.component.ts - 121 - - - src/app/components/time/time.component.ts - 122 - - - src/app/components/time/time.component.ts - 123 - - - src/app/components/time/time.component.ts - 124 - - - src/app/components/time/time.component.ts - 125 - src/app/components/time/time.component.ts 126 + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + src/app/components/time/time.component.ts 130 @@ -4471,54 +4593,54 @@ src/app/components/time/time.component.ts 132 - - src/app/components/time/time.component.ts - 133 - - - src/app/components/time/time.component.ts - 134 - - - src/app/components/time/time.component.ts - 135 - src/app/components/time/time.component.ts 136 + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 + After jälkeen - - src/app/components/time/time.component.ts - 143 - - - src/app/components/time/time.component.ts - 144 - - - src/app/components/time/time.component.ts - 145 - - - src/app/components/time/time.component.ts - 146 - - - src/app/components/time/time.component.ts - 147 - - - src/app/components/time/time.component.ts - 148 - src/app/components/time/time.component.ts 149 + + src/app/components/time/time.component.ts + 150 + + + src/app/components/time/time.component.ts + 151 + + + src/app/components/time/time.component.ts + 152 + src/app/components/time/time.component.ts 153 @@ -4531,22 +4653,34 @@ src/app/components/time/time.component.ts 155 - - src/app/components/time/time.component.ts - 156 - - - src/app/components/time/time.component.ts - 157 - - - src/app/components/time/time.component.ts - 158 - src/app/components/time/time.component.ts 159 + + src/app/components/time/time.component.ts + 160 + + + src/app/components/time/time.component.ts + 161 + + + src/app/components/time/time.component.ts + 162 + + + src/app/components/time/time.component.ts + 163 + + + src/app/components/time/time.component.ts + 164 + + + src/app/components/time/time.component.ts + 165 + This transaction has been replaced by: @@ -5439,6 +5573,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5679,7 +5817,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5820,7 +5958,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6138,6 +6276,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6618,19 +6760,22 @@ lightning.share - nodes - solmua + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6638,7 +6783,7 @@ BTC kapasiteetti src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6756,11 +6901,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.fr.xlf b/frontend/src/locale/messages.fr.xlf index 208b71ce0..d4158fdaa 100644 --- a/frontend/src/locale/messages.fr.xlf +++ b/frontend/src/locale/messages.fr.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1487,7 +1487,7 @@ Alliances communautaires src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Traducteurs src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Contributeurs au projet src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Membres du projet src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Mainteneurs de projet src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -3080,13 +3084,17 @@ Difficulty Adjustment Ajustement de la difficulté + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3094,11 +3102,11 @@ Remaining Restant - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3115,11 @@ blocks blocs - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3132,11 +3140,11 @@ block bloc - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3149,11 +3157,11 @@ Estimate Estimation - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3162,20 +3170,24 @@ Previous Précédent - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Période actuelle - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3184,11 +3196,110 @@ Next Halving Prochain halving - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + blocs attendus + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + bloc attendu + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + blocs trouvés + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + bloc trouvé + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + blocs restants + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + bloc restant + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + blocs d'avance + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + bloc d'avance + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + blocs de retard + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + bloc de retard + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + Temps de bloc moyen + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) Soit 2x les frais minimum, soit les frais de faible priorité (selon le plus bas) @@ -3667,7 +3778,7 @@ Statistiques de récompense src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3676,7 +3787,7 @@ (144 blocs) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3685,7 +3796,7 @@ Derniers blocs src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3698,7 +3809,7 @@ Ajustements src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3707,7 +3818,7 @@ Émettre une transaction src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3882,9 +3993,9 @@ 58 - - blocks - blocs + + blocks + blocs src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3893,6 +4004,42 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + Autre ( ) + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4366,40 +4513,28 @@ Juste maintenant src/app/components/time/time.component.ts - 78 + 79 ago Il y a - - src/app/components/time/time.component.ts - 97 - - - src/app/components/time/time.component.ts - 98 - - - src/app/components/time/time.component.ts - 99 - - - src/app/components/time/time.component.ts - 100 - - - src/app/components/time/time.component.ts - 101 - - - src/app/components/time/time.component.ts - 102 - src/app/components/time/time.component.ts 103 + + src/app/components/time/time.component.ts + 104 + + + src/app/components/time/time.component.ts + 105 + + + src/app/components/time/time.component.ts + 106 + src/app/components/time/time.component.ts 107 @@ -4412,54 +4547,54 @@ src/app/components/time/time.component.ts 109 - - src/app/components/time/time.component.ts - 110 - - - src/app/components/time/time.component.ts - 111 - - - src/app/components/time/time.component.ts - 112 - src/app/components/time/time.component.ts 113 + + src/app/components/time/time.component.ts + 114 + + + src/app/components/time/time.component.ts + 115 + + + src/app/components/time/time.component.ts + 116 + + + src/app/components/time/time.component.ts + 117 + + + src/app/components/time/time.component.ts + 118 + + + src/app/components/time/time.component.ts + 119 + In ~ Dans ~ - - src/app/components/time/time.component.ts - 120 - - - src/app/components/time/time.component.ts - 121 - - - src/app/components/time/time.component.ts - 122 - - - src/app/components/time/time.component.ts - 123 - - - src/app/components/time/time.component.ts - 124 - - - src/app/components/time/time.component.ts - 125 - src/app/components/time/time.component.ts 126 + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + src/app/components/time/time.component.ts 130 @@ -4472,54 +4607,54 @@ src/app/components/time/time.component.ts 132 - - src/app/components/time/time.component.ts - 133 - - - src/app/components/time/time.component.ts - 134 - - - src/app/components/time/time.component.ts - 135 - src/app/components/time/time.component.ts 136 + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 + After Après - - src/app/components/time/time.component.ts - 143 - - - src/app/components/time/time.component.ts - 144 - - - src/app/components/time/time.component.ts - 145 - - - src/app/components/time/time.component.ts - 146 - - - src/app/components/time/time.component.ts - 147 - - - src/app/components/time/time.component.ts - 148 - src/app/components/time/time.component.ts 149 + + src/app/components/time/time.component.ts + 150 + + + src/app/components/time/time.component.ts + 151 + + + src/app/components/time/time.component.ts + 152 + src/app/components/time/time.component.ts 153 @@ -4532,22 +4667,34 @@ src/app/components/time/time.component.ts 155 - - src/app/components/time/time.component.ts - 156 - - - src/app/components/time/time.component.ts - 157 - - - src/app/components/time/time.component.ts - 158 - src/app/components/time/time.component.ts 159 + + src/app/components/time/time.component.ts + 160 + + + src/app/components/time/time.component.ts + 161 + + + src/app/components/time/time.component.ts + 162 + + + src/app/components/time/time.component.ts + 163 + + + src/app/components/time/time.component.ts + 164 + + + src/app/components/time/time.component.ts + 165 + This transaction has been replaced by: @@ -5440,6 +5587,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5680,7 +5831,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5821,7 +5972,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6139,6 +6290,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6619,19 +6774,23 @@ lightning.share - nodes - nœuds + nodes + nœuds src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6639,7 +6798,7 @@ Capacité de BTC src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6757,11 +6916,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 @@ -6911,7 +7070,7 @@ week - semaine + sem src/app/shared/i18n/dates.ts 7 @@ -6919,7 +7078,7 @@ weeks - semaines + sem src/app/shared/i18n/dates.ts 8 diff --git a/frontend/src/locale/messages.he.xlf b/frontend/src/locale/messages.he.xlf index 3ab6c3305..a7e3962da 100644 --- a/frontend/src/locale/messages.he.xlf +++ b/frontend/src/locale/messages.he.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1487,7 +1487,7 @@ בני ברית מהקהילה src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ מתרגמי הפרוייקט src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ תורמי הפרוייקט src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ חברי צוות הפרוייקט src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ מתחזקי הפרוייקט src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -3080,13 +3084,17 @@ Difficulty Adjustment התאמת קשי + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3094,11 +3102,11 @@ Remaining נותרו - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3115,11 @@ blocks בלוקים - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3132,11 +3140,11 @@ block בלוק - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3149,11 +3157,11 @@ Estimate הערכה - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3162,20 +3170,24 @@ Previous הקודם - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period מחזור נוכחי - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3184,11 +3196,99 @@ Next Halving חצייה הבאה - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) או כפול מהמינימום או בעמלת עדיפות נמוכה (הנמוך מבין השניים) @@ -3666,7 +3766,7 @@ סטטיסטיקת פרסים src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3675,7 +3775,7 @@ (144 בלוקים) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3684,7 +3784,7 @@ בלוקים אחרונים src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3697,7 +3797,7 @@ התאמות src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3706,7 +3806,7 @@ שדר טרנזקציה src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3880,9 +3980,8 @@ 58 - - blocks - בלוקים + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3891,6 +3990,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4363,40 +4497,28 @@ זה עתה src/app/components/time/time.component.ts - 78 + 79 ago לפני - - src/app/components/time/time.component.ts - 97 - - - src/app/components/time/time.component.ts - 98 - - - src/app/components/time/time.component.ts - 99 - - - src/app/components/time/time.component.ts - 100 - - - src/app/components/time/time.component.ts - 101 - - - src/app/components/time/time.component.ts - 102 - src/app/components/time/time.component.ts 103 + + src/app/components/time/time.component.ts + 104 + + + src/app/components/time/time.component.ts + 105 + + + src/app/components/time/time.component.ts + 106 + src/app/components/time/time.component.ts 107 @@ -4409,53 +4531,53 @@ src/app/components/time/time.component.ts 109 - - src/app/components/time/time.component.ts - 110 - - - src/app/components/time/time.component.ts - 111 - - - src/app/components/time/time.component.ts - 112 - src/app/components/time/time.component.ts 113 + + src/app/components/time/time.component.ts + 114 + + + src/app/components/time/time.component.ts + 115 + + + src/app/components/time/time.component.ts + 116 + + + src/app/components/time/time.component.ts + 117 + + + src/app/components/time/time.component.ts + 118 + + + src/app/components/time/time.component.ts + 119 + In ~ - - src/app/components/time/time.component.ts - 120 - - - src/app/components/time/time.component.ts - 121 - - - src/app/components/time/time.component.ts - 122 - - - src/app/components/time/time.component.ts - 123 - - - src/app/components/time/time.component.ts - 124 - - - src/app/components/time/time.component.ts - 125 - src/app/components/time/time.component.ts 126 + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + src/app/components/time/time.component.ts 130 @@ -4468,54 +4590,54 @@ src/app/components/time/time.component.ts 132 - - src/app/components/time/time.component.ts - 133 - - - src/app/components/time/time.component.ts - 134 - - - src/app/components/time/time.component.ts - 135 - src/app/components/time/time.component.ts 136 + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 + After לאחר - - src/app/components/time/time.component.ts - 143 - - - src/app/components/time/time.component.ts - 144 - - - src/app/components/time/time.component.ts - 145 - - - src/app/components/time/time.component.ts - 146 - - - src/app/components/time/time.component.ts - 147 - - - src/app/components/time/time.component.ts - 148 - src/app/components/time/time.component.ts 149 + + src/app/components/time/time.component.ts + 150 + + + src/app/components/time/time.component.ts + 151 + + + src/app/components/time/time.component.ts + 152 + src/app/components/time/time.component.ts 153 @@ -4528,22 +4650,34 @@ src/app/components/time/time.component.ts 155 - - src/app/components/time/time.component.ts - 156 - - - src/app/components/time/time.component.ts - 157 - - - src/app/components/time/time.component.ts - 158 - src/app/components/time/time.component.ts 159 + + src/app/components/time/time.component.ts + 160 + + + src/app/components/time/time.component.ts + 161 + + + src/app/components/time/time.component.ts + 162 + + + src/app/components/time/time.component.ts + 163 + + + src/app/components/time/time.component.ts + 164 + + + src/app/components/time/time.component.ts + 165 + This transaction has been replaced by: @@ -5426,6 +5560,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5665,7 +5803,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5806,7 +5944,7 @@ סאטושיז src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6120,6 +6258,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6589,19 +6731,22 @@ lightning.share - nodes - צמתים + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6609,7 +6754,7 @@ קיבולת ביטקוין src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6721,11 +6866,11 @@ ביטקוין src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.hu.xlf b/frontend/src/locale/messages.hu.xlf index 2cbb07923..9b07c7917 100644 --- a/frontend/src/locale/messages.hu.xlf +++ b/frontend/src/locale/messages.hu.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 385,389 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1074,7 +1074,7 @@ src/app/components/transaction/transaction.component.html - 282,284 + 283,285 transaction.version @@ -1202,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 256,261 + 257,262 src/app/components/transaction/transaction.component.html - 400,406 + 401,407 transaction.details @@ -1223,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 243,247 + 244,248 src/app/components/transaction/transaction.component.html - 371,377 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1245,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 244,243 + 246,245 @@ -1451,7 +1451,7 @@ Our mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, completely self-hosted without any trusted third-parties. src/app/components/about/about.component.html - 13,17 + 13,16 @@ -1459,7 +1459,7 @@ Céges Szponzorok 🚀 src/app/components/about/about.component.html - 29,32 + 19,22 about.sponsors.enterprise.withRocket @@ -1468,7 +1468,7 @@ Közösségi Szponzorok ❤️ src/app/components/about/about.component.html - 177,180 + 167,170 about.sponsors.withHeart @@ -1477,7 +1477,7 @@ Közösségi Integrációk src/app/components/about/about.component.html - 191,193 + 181,183 about.community-integrations @@ -1486,7 +1486,7 @@ Közösségi Szövetségesek src/app/components/about/about.component.html - 285,287 + 291,293 about.alliances @@ -1495,7 +1495,7 @@ Projekt Fordítók src/app/components/about/about.component.html - 301,303 + 307,309 about.translators @@ -1504,7 +1504,7 @@ Projekt Kontribútorok src/app/components/about/about.component.html - 315,317 + 321,323 about.contributors @@ -1513,7 +1513,7 @@ Projekt Tagok src/app/components/about/about.component.html - 327,329 + 333,335 about.project_members @@ -1522,7 +1522,7 @@ Projekt Fenntartók src/app/components/about/about.component.html - 340,342 + 346,348 about.maintainers @@ -1531,7 +1531,7 @@ Részletek src/app/components/about/about.component.ts - 39 + 42 src/app/components/bisq-master-page/bisq-master-page.component.html @@ -2042,7 +2042,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2091,7 +2091,7 @@ src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2112,7 +2112,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2153,7 +2153,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2179,7 +2179,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/transactions-list/transactions-list.component.html @@ -2201,7 +2201,7 @@ src/app/components/transaction/transaction.component.html - 475,477 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2213,7 +2213,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2295,11 +2295,11 @@ src/app/components/transaction/transaction.component.html - 477,480 + 478,481 src/app/components/transaction/transaction.component.html - 488,490 + 489,491 src/app/components/transactions-list/transactions-list.component.html @@ -2329,7 +2329,7 @@ src/app/components/transaction/transaction.component.html - 268,271 + 269,272 Transaction Virtual Size transaction.vsize @@ -2405,7 +2405,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2446,7 +2446,7 @@ src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2463,7 +2463,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2504,7 +2504,7 @@ src/app/components/transaction/transaction.component.html - 264,266 + 265,267 src/app/dashboard/dashboard.component.html @@ -2532,11 +2532,12 @@ src/app/components/transaction/transaction.component.html - 272,274 + 273,275 Size per weight + Méret súlyonként src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts 200,199 @@ -2630,6 +2631,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2683,11 +2688,11 @@ src/app/lightning/node/node.component.html - 52,55 + 55,58 src/app/lightning/node/node.component.html - 96,100 + 99,103 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts @@ -2843,11 +2848,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2888,19 +2893,19 @@ src/app/components/transaction/transaction.component.html - 248,253 + 249,254 src/app/lightning/channel/channel.component.html - 86,88 + 93,95 src/app/lightning/channel/channel.component.html - 96,98 + 103,105 src/app/lightning/node/node.component.html - 218,222 + 221,225 Transaction Details transaction.details @@ -2920,10 +2925,6 @@ src/app/lightning/channel/channel-preview.component.html 70,75 - - src/app/lightning/channel/channel.component.html - 109,115 - src/app/lightning/node/node-preview.component.html 66,69 @@ -3081,13 +3082,17 @@ Difficulty Adjustment Bányászási Nehézségifok + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3095,11 +3100,11 @@ Remaining Hátramaradt - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3112,11 @@ blocks - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3131,11 +3136,11 @@ block - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3148,11 +3153,11 @@ Estimate Becslés - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3161,20 +3166,24 @@ Previous Előző - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Mostani Periódus - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3183,11 +3192,99 @@ Next Halving Következő Felezés - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) @@ -3343,7 +3440,7 @@ Bányászat src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3352,7 +3449,7 @@ Pool Rangsorolás src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3365,7 +3462,7 @@ Pool Fölény src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3378,7 +3475,7 @@ Hashráta és Nehézség src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3387,7 +3484,7 @@ Villám src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3396,7 +3493,7 @@ Villám Nodeok Hálózatonként src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3417,7 +3514,7 @@ Villám Hálózati Kapacítás src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3438,7 +3535,7 @@ Villám Node Szolgáltatónként src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3451,7 +3548,7 @@ Villám Nodeok Országonként src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3468,7 +3565,7 @@ Villám Node Világ Térkép src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3485,7 +3582,7 @@ Villám Node Csatorna Világ Térkép src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3506,11 +3603,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3540,11 +3637,11 @@ Hashráta (MA) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3661,7 +3758,7 @@ Jutalmi statisztikák src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3670,7 +3767,7 @@ (144 blokk) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3679,7 +3776,7 @@ Legutóbbi blokkok src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3692,7 +3789,7 @@ Módosítás src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3701,7 +3798,7 @@ Tranzakció Küldése src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3869,9 +3966,8 @@ 58 - - blocks - blokk + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3880,6 +3976,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4099,12 +4230,13 @@ src/app/components/transaction/transaction.component.html - 290,291 + 291,292 transaction.hex Miners Reward + Bányász Jutalma src/app/components/reward-stats/reward-stats.component.html 5 @@ -4308,7 +4440,7 @@ Filter src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4317,7 +4449,7 @@ Invertál src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4326,7 +4458,7 @@ vBájtnyi tranzakciók másodpercenként (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4334,196 +4466,187 @@ Just now Épp most - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After után - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4578,7 +4701,7 @@ src/app/lightning/node/node.component.html - 67,70 + 70,73 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -4594,11 +4717,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 13,15 + 15,16 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 13,15 + 15,16 Transaction first seen transaction.first-seen @@ -4656,7 +4779,7 @@ src/app/components/transaction/transaction.component.html - 340,344 + 341,345 Transaction flow transaction.flow @@ -4675,7 +4798,7 @@ Továbbiak megjelenítése src/app/components/transaction/transaction.component.html - 225,227 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4692,7 +4815,7 @@ Kevesebb megjelenítése src/app/components/transaction/transaction.component.html - 227,233 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4705,7 +4828,7 @@ Diagram megjelenítése src/app/components/transaction/transaction.component.html - 247,248 + 248,249 show-diagram @@ -4714,7 +4837,7 @@ Zárolási idő src/app/components/transaction/transaction.component.html - 286,288 + 287,289 transaction.locktime @@ -4723,7 +4846,7 @@ Nem található tranzakció. src/app/components/transaction/transaction.component.html - 449,450 + 450,451 transaction.error.transaction-not-found @@ -4732,7 +4855,7 @@ Várakozás arra hogy a mempoolban feltünjön... src/app/components/transaction/transaction.component.html - 450,455 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4741,7 +4864,7 @@ Effektív díj ráta src/app/components/transaction/transaction.component.html - 485,488 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -5186,6 +5309,10 @@ src/app/docs/api-docs/api-docs.component.html 13 + + src/app/docs/api-docs/api-docs.component.html + 14 + faq.big-disclaimer @@ -5193,7 +5320,7 @@ REST API szolgáltatás src/app/docs/api-docs/api-docs.component.html - 41,42 + 42,43 api-docs.title @@ -5202,11 +5329,11 @@ Végpont src/app/docs/api-docs/api-docs.component.html - 50,51 + 51,52 src/app/docs/api-docs/api-docs.component.html - 104,107 + 105,108 Api docs endpoint @@ -5215,11 +5342,11 @@ Leírás src/app/docs/api-docs/api-docs.component.html - 69,70 + 70,71 src/app/docs/api-docs/api-docs.component.html - 108,109 + 109,110 @@ -5227,7 +5354,7 @@ Alaphelyzeti push: művelet: 'kell', data: ['blocks', ...] hogy kifejezd mit szeretnél pusholni. Elérhető: blocks, mempool-blocks, live-2h-chart, and stats.Pusholjon tranzakciókat címekhez fogva: 'cím-követés': '3PbJ...bF9B' az összes új tranzakció fogadásához, amely ezt a címet tartalmazza bemenetként vagy kimenetként. Tranzakciók tömbjét adja vissza. cím-tranzakciókúj mempool tranzakciókhoz , és block-tranzakciók az új blokk megerősített tranzakciókhoz. src/app/docs/api-docs/api-docs.component.html - 109,110 + 110,111 api-docs.websocket.websocket @@ -5324,7 +5451,7 @@ src/app/lightning/node/node.component.html - 180,182 + 183,185 shared.m-sats @@ -5400,6 +5527,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5440,7 +5571,7 @@ src/app/lightning/channel/channel.component.html - 11,12 + 13,14 src/app/lightning/channels-list/channels-list.component.html @@ -5457,7 +5588,7 @@ src/app/lightning/channel/channel.component.html - 12,13 + 14,15 src/app/lightning/channels-list/channels-list.component.html @@ -5474,7 +5605,7 @@ src/app/lightning/channel/channel.component.html - 13,14 + 15,16 src/app/lightning/channels-list/channels-list.component.html @@ -5495,7 +5626,7 @@ src/app/lightning/channel/channel.component.html - 29,30 + 36,37 lightning.created @@ -5508,12 +5639,20 @@ src/app/lightning/channel/channel.component.html - 48,49 + 55,56 src/app/lightning/channels-list/channels-list.component.html 43,46 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 + src/app/lightning/node-statistics/node-statistics.component.html 4,5 @@ -5542,6 +5681,10 @@ src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 60,62 + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 13,14 + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 202,201 @@ -5578,11 +5721,11 @@ Villám csatorna src/app/lightning/channel/channel.component.html - 2,5 + 4,7 src/app/lightning/channel/channel.component.html - 117,119 + 116,118 lightning.channel @@ -5591,11 +5734,11 @@ Utolsó frissítés src/app/lightning/channel/channel.component.html - 33,34 + 40,41 src/app/lightning/node/node.component.html - 73,75 + 76,78 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5611,11 +5754,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 14,15 + 16,17 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 14,15 + 16,17 lightning.last-update @@ -5624,11 +5767,11 @@ Zárási dátum src/app/lightning/channel/channel.component.html - 37,38 + 44,45 src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5637,7 +5780,7 @@ Lezárva átala src/app/lightning/channel/channel.component.html - 52,54 + 59,61 lightning.closed_by @@ -5646,7 +5789,7 @@ Nyitó tranzakció src/app/lightning/channel/channel.component.html - 84,85 + 91,92 lightning.opening-transaction @@ -5655,7 +5798,7 @@ Záró tranzakció src/app/lightning/channel/channel.component.html - 93,95 + 100,102 lightning.closing-transaction @@ -5677,6 +5820,7 @@ Force closed + Kényszer zárva src/app/lightning/channel/closing-type/closing-type.component.ts 24 @@ -5684,6 +5828,7 @@ Force closed with penalty + Kényszer zárva büntető díjjal src/app/lightning/channel/closing-type/closing-type.component.ts 28 @@ -5736,11 +5881,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 10,11 + 11,12 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 10,12 + 11,13 lightning.alias @@ -5767,7 +5912,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -5817,6 +5962,7 @@ avg + átlag src/app/lightning/channels-statistics/channels-statistics.component.html 3,5 @@ -5825,6 +5971,7 @@ med + közép src/app/lightning/channels-statistics/channels-statistics.component.html 6,9 @@ -6005,10 +6152,6 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 11,12 - - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html 12,13 lightning.liquidity @@ -6024,6 +6167,14 @@ src/app/lightning/group/group.component.html 40,44 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 + src/app/lightning/node-statistics/node-statistics.component.html 28,29 @@ -6062,16 +6213,20 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 12,13 + 14,15 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 11,12 + 12,13 src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6104,7 +6259,7 @@ src/app/lightning/node/node.component.html - 47,49 + 50,52 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -6120,11 +6275,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 15,17 + 17,20 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 15,17 + 17,20 lightning.location @@ -6158,9 +6313,17 @@ src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 62 + + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html + 4,9 + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.ts - 29 + 33 + + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 4,9 src/app/lightning/nodes-rankings-dashboard/nodes-rankings-dashboard.component.html @@ -6182,6 +6345,7 @@ Fee distribution + Díj eloszlás src/app/lightning/node-fee-chart/node-fee-chart.component.html 2 @@ -6190,6 +6354,7 @@ Outgoing Fees + Kimenő Díjak src/app/lightning/node-fee-chart/node-fee-chart.component.ts 170 @@ -6201,6 +6366,7 @@ Incoming Fees + Beérkező Díjak src/app/lightning/node-fee-chart/node-fee-chart.component.ts 178 @@ -6235,11 +6401,11 @@ src/app/lightning/node/node.component.html - 2,4 + 4,6 src/app/lightning/node/node.component.html - 260,262 + 263,265 lightning.node @@ -6252,19 +6418,20 @@ src/app/lightning/node/node.component.html - 27,30 + 30,33 lightning.active-capacity Active channels + Aktív csatornák src/app/lightning/node/node-preview.component.html 26,30 src/app/lightning/node/node.component.html - 34,38 + 37,41 lightning.active-channels @@ -6277,19 +6444,11 @@ country - - No node found for public key "" - - src/app/lightning/node/node.component.html - 17,19 - - lightning.node-not-found - Average channel size src/app/lightning/node/node.component.html - 40,43 + 43,46 lightning.active-channels-avg @@ -6297,7 +6456,7 @@ Avg channel distance src/app/lightning/node/node.component.html - 56,57 + 59,60 lightning.avg-distance @@ -6306,7 +6465,7 @@ Szín src/app/lightning/node/node.component.html - 79,81 + 82,84 lightning.color @@ -6315,7 +6474,7 @@ ISP src/app/lightning/node/node.component.html - 86,87 + 89,90 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html @@ -6327,7 +6486,7 @@ Exclusively on Tor src/app/lightning/node/node.component.html - 93,95 + 96,98 tor @@ -6335,7 +6494,7 @@ Liquidity ad src/app/lightning/node/node.component.html - 138,141 + 141,144 node.liquidity-ad @@ -6343,7 +6502,7 @@ Lease fee rate src/app/lightning/node/node.component.html - 144,147 + 147,150 Liquidity ad lease fee rate liquidity-ad.lease-fee-rate @@ -6352,7 +6511,7 @@ Lease base fee src/app/lightning/node/node.component.html - 152,154 + 155,157 liquidity-ad.lease-base-fee @@ -6360,7 +6519,7 @@ Funding weight src/app/lightning/node/node.component.html - 158,159 + 161,162 liquidity-ad.funding-weight @@ -6368,16 +6527,17 @@ Channel fee rate src/app/lightning/node/node.component.html - 168,171 + 171,174 Liquidity ad channel fee rate liquidity-ad.channel-fee-rate Channel base fee + Csatorna alapdíj src/app/lightning/node/node.component.html - 176,178 + 179,181 liquidity-ad.channel-base-fee @@ -6385,7 +6545,7 @@ Compact lease src/app/lightning/node/node.component.html - 188,190 + 191,193 liquidity-ad.compact-lease @@ -6394,7 +6554,7 @@ TLV kiterjesztési esemény src/app/lightning/node/node.component.html - 199,202 + 202,205 node.tlv.records @@ -6403,7 +6563,7 @@ Nyitott csatornák src/app/lightning/node/node.component.html - 240,243 + 243,246 lightning.open-channels @@ -6412,7 +6572,7 @@ Lezárt csatornák src/app/lightning/node/node.component.html - 244,247 + 247,250 lightning.open-channels @@ -6453,6 +6613,7 @@ No geolocation data available + Geolokációs adat nem elérhető src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts 219,214 @@ -6460,6 +6621,7 @@ Active channels map + Aktív csatorna térkép src/app/lightning/nodes-channels/node-channels.component.html 2,3 @@ -6468,6 +6630,7 @@ Indexing in progress + Indexelés folyamatban src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 121,116 @@ -6477,8 +6640,8 @@ 112,107 - - Reachable on Clearnet Only + + Clearnet and Darknet src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -6488,8 +6651,8 @@ 303,302 - - Reachable on Clearnet and Darknet + + Clearnet Only (IPv4, IPv6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -6499,8 +6662,8 @@ 295,294 - - Reachable on Darknet Only + + Darknet Only (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -6524,26 +6687,30 @@ lightning.share - nodes - nódok + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 BTC capacity + BTC kapacitás src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6656,11 +6823,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 @@ -6741,27 +6908,12 @@ Oldest lightning nodes + Legidősebb villám nodeok src/app/lightning/nodes-ranking/oldest-nodes/oldest-nodes.component.ts 27 - - Top 100 nodes liquidity ranking - - src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 3,7 - - lightning.top-100-liquidity - - - Top 100 nodes connectivity ranking - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 3,7 - - lightning.top-100-connectivity - Oldest nodes Legrégebbi nodeok diff --git a/frontend/src/locale/messages.it.xlf b/frontend/src/locale/messages.it.xlf index d48ce0dcb..22d7cf978 100644 --- a/frontend/src/locale/messages.it.xlf +++ b/frontend/src/locale/messages.it.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 385,389 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1074,7 +1074,7 @@ src/app/components/transaction/transaction.component.html - 282,284 + 283,285 transaction.version @@ -1202,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 256,261 + 257,262 src/app/components/transaction/transaction.component.html - 400,406 + 401,407 transaction.details @@ -1223,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 243,247 + 244,248 src/app/components/transaction/transaction.component.html - 371,377 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1245,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 244,243 + 246,245 @@ -1452,7 +1452,7 @@ I nostri mempool e blockchain explorer per la community di Bitcoin, con attenzione su costi di transazione di mercato e ecosistema multi-strato, completamente self-hosted senza bisogno di terze parti. src/app/components/about/about.component.html - 13,17 + 13,16 @@ -1460,7 +1460,7 @@ Sponsor Aziendali 🚀 src/app/components/about/about.component.html - 29,32 + 19,22 about.sponsors.enterprise.withRocket @@ -1469,7 +1469,7 @@ Sponsor comunitari ❤️ src/app/components/about/about.component.html - 177,180 + 167,170 about.sponsors.withHeart @@ -1478,7 +1478,7 @@ Integrazioni della comunità src/app/components/about/about.component.html - 191,193 + 181,183 about.community-integrations @@ -1487,7 +1487,7 @@ Alleanze della comunità src/app/components/about/about.component.html - 285,287 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Traduttori del progetto src/app/components/about/about.component.html - 301,303 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Hanno contribuito al progetto src/app/components/about/about.component.html - 315,317 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Membri del Progetto src/app/components/about/about.component.html - 327,329 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Manutentori del progetto src/app/components/about/about.component.html - 340,342 + 346,348 about.maintainers @@ -1532,7 +1532,7 @@ Su di noi src/app/components/about/about.component.ts - 39 + 42 src/app/components/bisq-master-page/bisq-master-page.component.html @@ -2044,7 +2044,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2093,7 +2093,7 @@ src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2114,7 +2114,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2155,7 +2155,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2181,7 +2181,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/transactions-list/transactions-list.component.html @@ -2203,7 +2203,7 @@ src/app/components/transaction/transaction.component.html - 475,477 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2297,11 +2297,11 @@ src/app/components/transaction/transaction.component.html - 477,480 + 478,481 src/app/components/transaction/transaction.component.html - 488,490 + 489,491 src/app/components/transactions-list/transactions-list.component.html @@ -2331,7 +2331,7 @@ src/app/components/transaction/transaction.component.html - 268,271 + 269,272 Transaction Virtual Size transaction.vsize @@ -2407,7 +2407,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2448,7 +2448,7 @@ src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2465,7 +2465,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2506,7 +2506,7 @@ src/app/components/transaction/transaction.component.html - 264,266 + 265,267 src/app/dashboard/dashboard.component.html @@ -2534,7 +2534,7 @@ src/app/components/transaction/transaction.component.html - 272,274 + 273,275 @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2686,11 +2690,11 @@ src/app/lightning/node/node.component.html - 52,55 + 55,58 src/app/lightning/node/node.component.html - 96,100 + 99,103 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts @@ -2846,11 +2850,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2891,19 +2895,19 @@ src/app/components/transaction/transaction.component.html - 248,253 + 249,254 src/app/lightning/channel/channel.component.html - 86,88 + 93,95 src/app/lightning/channel/channel.component.html - 96,98 + 103,105 src/app/lightning/node/node.component.html - 218,222 + 221,225 Transaction Details transaction.details @@ -2923,10 +2927,6 @@ src/app/lightning/channel/channel-preview.component.html 70,75 - - src/app/lightning/channel/channel.component.html - 109,115 - src/app/lightning/node/node-preview.component.html 66,69 @@ -3084,13 +3084,17 @@ Difficulty Adjustment Aggiustamento della Difficoltà + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3098,11 +3102,11 @@ Remaining Rimanente - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3111,11 +3115,11 @@ blocks blocchi - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3136,11 +3140,11 @@ block blocco - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3153,11 +3157,11 @@ Estimate Stima - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3166,20 +3170,24 @@ Previous Precedente - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Periodo Attuale - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3188,11 +3196,99 @@ Next Halving Prossimo Halving - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) O 2x il minimo o il tasso di Bassa Priorità (in base a quale sia il più basso) @@ -3350,7 +3446,7 @@ Mining src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3359,7 +3455,7 @@ Classifica Pool src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3372,7 +3468,7 @@ Predominanza Pool src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3385,7 +3481,7 @@ Hashrate & Difficoltà src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3394,7 +3490,7 @@ Lightning src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3403,7 +3499,7 @@ Nodi Lightning Per Network src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3424,7 +3520,7 @@ Capacità Lightning Network src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3445,7 +3541,7 @@ Nodi Lightning Per ISP src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3458,7 +3554,7 @@ Nodi Lightning Per Paese src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3474,7 +3570,7 @@ Lightning Nodes World Map src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3490,7 +3586,7 @@ Lightning Nodes Channels World Map src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3511,11 +3607,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3545,11 +3641,11 @@ Hashrate (MA) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3668,7 +3764,7 @@ Statistiche di ricompensa src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3677,7 +3773,7 @@ (144 blocchi) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3686,7 +3782,7 @@ Ultimi blocchi src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3699,7 +3795,7 @@ Adeguamenti src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3708,7 +3804,7 @@ Trasmetti Transazione src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3882,9 +3978,8 @@ 58 - - blocks - blocchi + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3893,6 +3988,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4114,7 +4244,7 @@ src/app/components/transaction/transaction.component.html - 290,291 + 291,292 transaction.hex @@ -4325,7 +4455,7 @@ Filtro src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4334,7 +4464,7 @@ Invertire src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4343,7 +4473,7 @@ vByte transati al secondo (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4351,196 +4481,187 @@ Just now Proprio adesso - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago fa - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After Dopo - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - In ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4594,7 +4715,7 @@ src/app/lightning/node/node.component.html - 67,70 + 70,73 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -4610,11 +4731,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 13,15 + 15,16 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 13,15 + 15,16 Transaction first seen transaction.first-seen @@ -4671,7 +4792,7 @@ src/app/components/transaction/transaction.component.html - 340,344 + 341,345 Transaction flow transaction.flow @@ -4688,7 +4809,7 @@ Show more src/app/components/transaction/transaction.component.html - 225,227 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4704,7 +4825,7 @@ Show less src/app/components/transaction/transaction.component.html - 227,233 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4716,7 +4837,7 @@ Show diagram src/app/components/transaction/transaction.component.html - 247,248 + 248,249 show-diagram @@ -4725,7 +4846,7 @@ Locktime src/app/components/transaction/transaction.component.html - 286,288 + 287,289 transaction.locktime @@ -4734,7 +4855,7 @@ Transazione non trovata. src/app/components/transaction/transaction.component.html - 449,450 + 450,451 transaction.error.transaction-not-found @@ -4743,7 +4864,7 @@ Aspettando che appaia nella mempool... src/app/components/transaction/transaction.component.html - 450,455 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4752,7 +4873,7 @@ Prezzo effettivo della commissione src/app/components/transaction/transaction.component.html - 485,488 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -5191,6 +5312,10 @@ src/app/docs/api-docs/api-docs.component.html 13 + + src/app/docs/api-docs/api-docs.component.html + 14 + faq.big-disclaimer @@ -5198,7 +5323,7 @@ Servizio REST API src/app/docs/api-docs/api-docs.component.html - 41,42 + 42,43 api-docs.title @@ -5207,11 +5332,11 @@ Endpoint src/app/docs/api-docs/api-docs.component.html - 50,51 + 51,52 src/app/docs/api-docs/api-docs.component.html - 104,107 + 105,108 Api docs endpoint @@ -5220,11 +5345,11 @@ Descrizione src/app/docs/api-docs/api-docs.component.html - 69,70 + 70,71 src/app/docs/api-docs/api-docs.component.html - 108,109 + 109,110 @@ -5232,7 +5357,7 @@ Push predefinito: action: 'want', data: ['blocks', ...] per esprimere cosa vuoi spingere. Disponibile: blocks, mempool-blocks, live-2h-chart, and stats.Spingi transazioni collegate all'indirizzo: 'track-address': '3PbJ...bF9B' per ricevere tutte le nuove transazioni contenenti quell'indirizzo come input o output. Restituisce un array di transazioni. address-transactions per nuove transazioni di mempool e block-transactions per le nuove transazioni confermate nel blocco. src/app/docs/api-docs/api-docs.component.html - 109,110 + 110,111 api-docs.websocket.websocket @@ -5327,7 +5452,7 @@ src/app/lightning/node/node.component.html - 180,182 + 183,185 shared.m-sats @@ -5397,6 +5522,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5433,7 +5562,7 @@ src/app/lightning/channel/channel.component.html - 11,12 + 13,14 src/app/lightning/channels-list/channels-list.component.html @@ -5449,7 +5578,7 @@ src/app/lightning/channel/channel.component.html - 12,13 + 14,15 src/app/lightning/channels-list/channels-list.component.html @@ -5465,7 +5594,7 @@ src/app/lightning/channel/channel.component.html - 13,14 + 15,16 src/app/lightning/channels-list/channels-list.component.html @@ -5485,7 +5614,7 @@ src/app/lightning/channel/channel.component.html - 29,30 + 36,37 lightning.created @@ -5497,12 +5626,20 @@ src/app/lightning/channel/channel.component.html - 48,49 + 55,56 src/app/lightning/channels-list/channels-list.component.html 43,46 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 + src/app/lightning/node-statistics/node-statistics.component.html 4,5 @@ -5531,6 +5668,10 @@ src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 60,62 + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 13,14 + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 202,201 @@ -5565,11 +5706,11 @@ Lightning channel src/app/lightning/channel/channel.component.html - 2,5 + 4,7 src/app/lightning/channel/channel.component.html - 117,119 + 116,118 lightning.channel @@ -5577,11 +5718,11 @@ Last update src/app/lightning/channel/channel.component.html - 33,34 + 40,41 src/app/lightning/node/node.component.html - 73,75 + 76,78 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5597,11 +5738,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 14,15 + 16,17 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 14,15 + 16,17 lightning.last-update @@ -5609,11 +5750,11 @@ Closing date src/app/lightning/channel/channel.component.html - 37,38 + 44,45 src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5621,7 +5762,7 @@ Closed by src/app/lightning/channel/channel.component.html - 52,54 + 59,61 lightning.closed_by @@ -5629,7 +5770,7 @@ Opening transaction src/app/lightning/channel/channel.component.html - 84,85 + 91,92 lightning.opening-transaction @@ -5637,7 +5778,7 @@ Closing transaction src/app/lightning/channel/channel.component.html - 93,95 + 100,102 lightning.closing-transaction @@ -5713,11 +5854,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 10,11 + 11,12 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 10,12 + 11,13 lightning.alias @@ -5741,7 +5882,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -5973,10 +6114,6 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 11,12 - - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html 12,13 lightning.liquidity @@ -5991,6 +6128,14 @@ src/app/lightning/group/group.component.html 40,44 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 + src/app/lightning/node-statistics/node-statistics.component.html 28,29 @@ -6029,16 +6174,20 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 12,13 + 14,15 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 11,12 + 12,13 src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6069,7 +6218,7 @@ src/app/lightning/node/node.component.html - 47,49 + 50,52 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -6085,11 +6234,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 15,17 + 17,20 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 15,17 + 17,20 lightning.location @@ -6123,9 +6272,17 @@ src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 62 + + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html + 4,9 + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.ts - 29 + 33 + + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 4,9 src/app/lightning/nodes-rankings-dashboard/nodes-rankings-dashboard.component.html @@ -6199,11 +6356,11 @@ src/app/lightning/node/node.component.html - 2,4 + 4,6 src/app/lightning/node/node.component.html - 260,262 + 263,265 lightning.node @@ -6215,7 +6372,7 @@ src/app/lightning/node/node.component.html - 27,30 + 30,33 lightning.active-capacity @@ -6227,7 +6384,7 @@ src/app/lightning/node/node.component.html - 34,38 + 37,41 lightning.active-channels @@ -6239,19 +6396,11 @@ country - - No node found for public key "" - - src/app/lightning/node/node.component.html - 17,19 - - lightning.node-not-found - Average channel size src/app/lightning/node/node.component.html - 40,43 + 43,46 lightning.active-channels-avg @@ -6259,7 +6408,7 @@ Avg channel distance src/app/lightning/node/node.component.html - 56,57 + 59,60 lightning.avg-distance @@ -6267,7 +6416,7 @@ Color src/app/lightning/node/node.component.html - 79,81 + 82,84 lightning.color @@ -6275,7 +6424,7 @@ ISP src/app/lightning/node/node.component.html - 86,87 + 89,90 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html @@ -6287,7 +6436,7 @@ Exclusively on Tor src/app/lightning/node/node.component.html - 93,95 + 96,98 tor @@ -6295,7 +6444,7 @@ Liquidity ad src/app/lightning/node/node.component.html - 138,141 + 141,144 node.liquidity-ad @@ -6303,7 +6452,7 @@ Lease fee rate src/app/lightning/node/node.component.html - 144,147 + 147,150 Liquidity ad lease fee rate liquidity-ad.lease-fee-rate @@ -6312,7 +6461,7 @@ Lease base fee src/app/lightning/node/node.component.html - 152,154 + 155,157 liquidity-ad.lease-base-fee @@ -6320,7 +6469,7 @@ Funding weight src/app/lightning/node/node.component.html - 158,159 + 161,162 liquidity-ad.funding-weight @@ -6328,7 +6477,7 @@ Channel fee rate src/app/lightning/node/node.component.html - 168,171 + 171,174 Liquidity ad channel fee rate liquidity-ad.channel-fee-rate @@ -6337,7 +6486,7 @@ Channel base fee src/app/lightning/node/node.component.html - 176,178 + 179,181 liquidity-ad.channel-base-fee @@ -6345,7 +6494,7 @@ Compact lease src/app/lightning/node/node.component.html - 188,190 + 191,193 liquidity-ad.compact-lease @@ -6353,7 +6502,7 @@ TLV extension records src/app/lightning/node/node.component.html - 199,202 + 202,205 node.tlv.records @@ -6361,7 +6510,7 @@ Open channels src/app/lightning/node/node.component.html - 240,243 + 243,246 lightning.open-channels @@ -6369,7 +6518,7 @@ Closed channels src/app/lightning/node/node.component.html - 244,247 + 247,250 lightning.open-channels @@ -6433,8 +6582,8 @@ 112,107 - - Reachable on Clearnet Only + + Clearnet and Darknet src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -6444,8 +6593,8 @@ 303,302 - - Reachable on Clearnet and Darknet + + Clearnet Only (IPv4, IPv6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -6455,8 +6604,8 @@ 295,294 - - Reachable on Darknet Only + + Darknet Only (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -6479,25 +6628,29 @@ lightning.share - nodes + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 BTC capacity src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6603,11 +6756,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 @@ -6688,22 +6841,6 @@ 27 - - Top 100 nodes liquidity ranking - - src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 3,7 - - lightning.top-100-liquidity - - - Top 100 nodes connectivity ranking - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 3,7 - - lightning.top-100-connectivity - Oldest nodes diff --git a/frontend/src/locale/messages.ja.xlf b/frontend/src/locale/messages.ja.xlf index 56975a922..cf9d860dd 100644 --- a/frontend/src/locale/messages.ja.xlf +++ b/frontend/src/locale/messages.ja.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1487,7 +1487,7 @@ コミュニティーの提携 src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ プロジェクト翻訳者 src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ プロジェクト貢献者 src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ プロジェクトメンバー src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ プロジェクトメンテナー src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -3094,7 +3094,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3203,6 +3203,7 @@ blocks expected + 個のブロック - 期待値 src/app/components/difficulty/difficulty-tooltip.component.html 13 @@ -3211,6 +3212,7 @@ block expected + 個のブロック - 期待値 src/app/components/difficulty/difficulty-tooltip.component.html 14 @@ -3219,6 +3221,7 @@ blocks mined + 個のブロック - 採掘済 src/app/components/difficulty/difficulty-tooltip.component.html 18 @@ -3227,6 +3230,7 @@ block mined + 個のブロック - 採掘済 src/app/components/difficulty/difficulty-tooltip.component.html 19 @@ -3235,6 +3239,7 @@ blocks remaining + 個のブロック - 残り src/app/components/difficulty/difficulty-tooltip.component.html 24 @@ -3243,6 +3248,7 @@ block remaining + 個のブロック - 残り src/app/components/difficulty/difficulty-tooltip.component.html 25 @@ -3251,6 +3257,7 @@ blocks ahead + 個のブロック - 早い src/app/components/difficulty/difficulty-tooltip.component.html 29 @@ -3259,6 +3266,7 @@ block ahead + 個のブロック - 早い src/app/components/difficulty/difficulty-tooltip.component.html 30 @@ -3267,6 +3275,7 @@ blocks behind + 個のブロック - 遅い src/app/components/difficulty/difficulty-tooltip.component.html 34 @@ -3275,6 +3284,7 @@ block behind + 個のブロック - 遅い src/app/components/difficulty/difficulty-tooltip.component.html 35 @@ -3283,6 +3293,7 @@ Average block time + 平均ブロック生成時間 src/app/components/difficulty/difficulty.component.html 42,45 @@ -3767,7 +3778,7 @@ 報酬の統計値 src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3776,7 +3787,7 @@ (144つのブロック) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3785,7 +3796,7 @@ 最新のブロック src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3798,7 +3809,7 @@ 補正 src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3807,7 +3818,7 @@ ブロードキャストトランザクション src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3982,9 +3993,9 @@ 58 - - blocks - のブロック + + blocks + ブロック src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3993,6 +4004,42 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + その他 ( ) + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4148,7 +4195,7 @@ Mined blocks - マイニングされたブロック + 採掘されたブロック src/app/components/pool/pool.component.html 141,143 @@ -4269,7 +4316,7 @@ BTC/block - BTC/ブロック + BTC/ﾌﾞﾛｯｸ src/app/components/reward-stats/reward-stats.component.html 21,24 @@ -4279,7 +4326,7 @@ Avg Tx Fee - 平均トランザクション手数料 + 平均取引手数料 src/app/components/reward-stats/reward-stats.component.html 30 @@ -4531,6 +4578,7 @@ In ~ + あと〜で src/app/components/time/time.component.ts 126 @@ -5539,6 +5587,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5779,7 +5831,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5920,7 +5972,7 @@ ｻﾄｼ src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6238,6 +6290,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6718,19 +6774,23 @@ lightning.share - nodes - 台 + nodes + ノード src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6738,7 +6798,7 @@ BTC 容量 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6856,11 +6916,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.ka.xlf b/frontend/src/locale/messages.ka.xlf index 762fd754e..ae1ba6c6d 100644 --- a/frontend/src/locale/messages.ka.xlf +++ b/frontend/src/locale/messages.ka.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1074,7 +1074,7 @@ src/app/components/transaction/transaction.component.html - 282,284 + 283,285 transaction.version @@ -1202,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 256,261 + 257,262 src/app/components/transaction/transaction.component.html - 400,406 + 401,407 transaction.details @@ -1223,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 243,247 + 244,248 src/app/components/transaction/transaction.component.html - 371,377 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1245,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 244,243 + 246,245 @@ -1487,7 +1487,7 @@ ალიანსი src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ მთარგმნელები src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ მოხალისეები src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ პროექტის წევრები src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ პროექტის შემქმნელები src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -1581,7 +1581,7 @@ src/app/components/amount/amount.component.html - 20,23 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -2044,7 +2044,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2093,7 +2093,7 @@ src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2114,7 +2114,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2155,7 +2155,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2181,7 +2181,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/transactions-list/transactions-list.component.html @@ -2203,7 +2203,7 @@ src/app/components/transaction/transaction.component.html - 475,477 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2297,11 +2297,11 @@ src/app/components/transaction/transaction.component.html - 477,480 + 478,481 src/app/components/transaction/transaction.component.html - 488,490 + 489,491 src/app/components/transactions-list/transactions-list.component.html @@ -2331,7 +2331,7 @@ src/app/components/transaction/transaction.component.html - 268,271 + 269,272 Transaction Virtual Size transaction.vsize @@ -2407,7 +2407,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2448,7 +2448,7 @@ src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2465,7 +2465,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2506,7 +2506,7 @@ src/app/components/transaction/transaction.component.html - 264,266 + 265,267 src/app/dashboard/dashboard.component.html @@ -2534,7 +2534,7 @@ src/app/components/transaction/transaction.component.html - 272,274 + 273,275 @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2846,11 +2850,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2891,7 +2895,7 @@ src/app/components/transaction/transaction.component.html - 248,253 + 249,254 src/app/lightning/channel/channel.component.html @@ -3080,13 +3084,17 @@ Difficulty Adjustment სირთულე + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3094,11 +3102,11 @@ Remaining დარჩა - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3115,11 @@ blocks ბლოკი - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3132,11 +3140,11 @@ block ბლოკი - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3149,11 +3157,11 @@ Estimate დაახლოებით - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3162,20 +3170,24 @@ Previous წინა - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period ეს პერიოდი - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3184,11 +3196,99 @@ Next Halving შემდეგი ჰალვინგი - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) ან მინიმუმის 2x ან დაბალ პრიორიტეტული საკომისიო (რომელიც უფრო დაბალია) @@ -3346,7 +3446,7 @@ მაინინგი src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3355,7 +3455,7 @@ Pools ის რეიტინგი src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3368,7 +3468,7 @@ Pools ის დომინურობა src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3381,7 +3481,7 @@ ჰაშრეიტი და სირთულე src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3390,7 +3490,7 @@ Lightning src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3399,7 +3499,7 @@ Lightning ნოდა ყოველ ნეთვორქზე src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3420,7 +3520,7 @@ Lightning ის შესაძლებლობა src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3441,7 +3541,7 @@ Lightning Nodes Per ISP src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3454,7 +3554,7 @@ Lightning ის ნოდა ქვეყნების მიხედვით src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3471,7 +3571,7 @@ Lightning ის ნოდები მსოფლიოს რუქაზე src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3488,7 +3588,7 @@ Lightning ის ნოდის ჩანელები მსოფლიო რუქაზე src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3509,11 +3609,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3543,11 +3643,11 @@ ჰაშრეიტი src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3667,7 +3767,7 @@ ანაზღაურების სტატისტიკა src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3676,7 +3776,7 @@ (144 ბლოკი) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3685,7 +3785,7 @@ ბოლო ბლოკები src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3698,7 +3798,7 @@ ცვლილებები src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3707,7 +3807,7 @@ Broadcast Transaction src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3882,9 +3982,8 @@ 58 - - blocks - ბლოკები + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3893,6 +3992,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4115,7 +4249,7 @@ src/app/components/transaction/transaction.component.html - 290,291 + 291,292 transaction.hex @@ -4339,7 +4473,7 @@ გაფილტვრა src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4348,7 +4482,7 @@ შებრუნება src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4357,7 +4491,7 @@ ტრანზაქცია vBytes წამში (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4365,196 +4499,187 @@ Just now ახლა - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago წინ - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After შემდეგ - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - ~-ში - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4688,7 +4813,7 @@ src/app/components/transaction/transaction.component.html - 340,344 + 341,345 Transaction flow transaction.flow @@ -4707,7 +4832,7 @@ მეტის ჩვენება src/app/components/transaction/transaction.component.html - 225,227 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4724,7 +4849,7 @@ ნაკლების ჩვენება src/app/components/transaction/transaction.component.html - 227,233 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4737,7 +4862,7 @@ დიაგრამის ჩვენება src/app/components/transaction/transaction.component.html - 247,248 + 248,249 show-diagram @@ -4746,7 +4871,7 @@ Locktime src/app/components/transaction/transaction.component.html - 286,288 + 287,289 transaction.locktime @@ -4755,7 +4880,7 @@ ტრანსაქცია ვერ მოიძებნა. src/app/components/transaction/transaction.component.html - 449,450 + 450,451 transaction.error.transaction-not-found @@ -4764,7 +4889,7 @@ დაელოდეთ mempool-ში რომ გამოჩნდეს... src/app/components/transaction/transaction.component.html - 450,455 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4773,7 +4898,7 @@ ეფექტური საკომისიო src/app/components/transaction/transaction.component.html - 485,488 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -5228,6 +5353,10 @@ src/app/docs/api-docs/api-docs.component.html 13 + + src/app/docs/api-docs/api-docs.component.html + 14 + faq.big-disclaimer @@ -5235,7 +5364,7 @@ REST API service src/app/docs/api-docs/api-docs.component.html - 41,42 + 42,43 api-docs.title @@ -5244,11 +5373,11 @@ დასასრული src/app/docs/api-docs/api-docs.component.html - 50,51 + 51,52 src/app/docs/api-docs/api-docs.component.html - 104,107 + 105,108 Api docs endpoint @@ -5257,11 +5386,11 @@ აღწერა src/app/docs/api-docs/api-docs.component.html - 69,70 + 70,71 src/app/docs/api-docs/api-docs.component.html - 108,109 + 109,110 @@ -5269,7 +5398,7 @@ Default push: action: 'want', data: ['blocks', ...] to express what you want pushed. Available: blocks, mempool-blocks, live-2h-chart, and stats.Push transactions related to address: 'track-address': '3PbJ...bF9B' to receive all new transactions containing that address as input or output. Returns an array of transactions. address-transactions for new mempool transactions, and block-transactions for new block confirmed transactions. src/app/docs/api-docs/api-docs.component.html - 109,110 + 110,111 api-docs.websocket.websocket @@ -5444,6 +5573,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5558,6 +5691,14 @@ src/app/lightning/channels-list/channels-list.component.html 43,46 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 + src/app/lightning/node-statistics/node-statistics.component.html 4,5 @@ -5676,7 +5817,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5817,7 +5958,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6079,6 +6220,14 @@ src/app/lightning/group/group.component.html 40,44 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 + src/app/lightning/node-statistics/node-statistics.component.html 28,29 @@ -6127,6 +6276,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6607,19 +6760,22 @@ lightning.share - nodes - ნოდა + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6627,7 +6783,7 @@ BTC სიმძლავრე src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6745,11 +6901,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.ko.xlf b/frontend/src/locale/messages.ko.xlf index 1d2be3910..c8ba64090 100644 --- a/frontend/src/locale/messages.ko.xlf +++ b/frontend/src/locale/messages.ko.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1074,7 +1074,7 @@ src/app/components/transaction/transaction.component.html - 282,284 + 283,285 transaction.version @@ -1202,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 256,261 + 257,262 src/app/components/transaction/transaction.component.html - 400,406 + 401,407 transaction.details @@ -1223,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 243,247 + 244,248 src/app/components/transaction/transaction.component.html - 371,377 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1245,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 244,243 + 246,245 @@ -1486,7 +1486,7 @@ 커뮤니티 연합 src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1495,7 +1495,7 @@ 프로젝트 번역자 src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1504,7 +1504,7 @@ 프로젝트 참여자 목록 src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1513,7 +1513,7 @@ 프로젝트 멤버들 src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1522,7 +1522,7 @@ 프로젝트 관리자 목록 src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -1580,7 +1580,7 @@ src/app/components/amount/amount.component.html - 20,23 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -2043,7 +2043,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2092,7 +2092,7 @@ src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2113,7 +2113,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2153,7 +2153,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2179,7 +2179,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/transactions-list/transactions-list.component.html @@ -2201,7 +2201,7 @@ src/app/components/transaction/transaction.component.html - 475,477 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2213,7 +2213,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2295,11 +2295,11 @@ src/app/components/transaction/transaction.component.html - 477,480 + 478,481 src/app/components/transaction/transaction.component.html - 488,490 + 489,491 src/app/components/transactions-list/transactions-list.component.html @@ -2329,7 +2329,7 @@ src/app/components/transaction/transaction.component.html - 268,271 + 269,272 Transaction Virtual Size transaction.vsize @@ -2398,7 +2398,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2437,7 +2437,7 @@ src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2454,7 +2454,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2495,7 +2495,7 @@ src/app/components/transaction/transaction.component.html - 264,266 + 265,267 src/app/dashboard/dashboard.component.html @@ -2523,7 +2523,7 @@ src/app/components/transaction/transaction.component.html - 272,274 + 273,275 @@ -2621,6 +2621,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2828,11 +2832,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2872,7 +2876,7 @@ src/app/components/transaction/transaction.component.html - 248,253 + 249,254 src/app/lightning/channel/channel.component.html @@ -3061,13 +3065,17 @@ Difficulty Adjustment 난이도 조정 + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3075,11 +3083,11 @@ Remaining 남은 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3088,11 +3096,11 @@ blocks 블록 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3113,11 +3121,11 @@ block 블록 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3130,11 +3138,11 @@ Estimate 추정 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3143,20 +3151,24 @@ Previous 이전 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period 현재 기간 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3165,11 +3177,99 @@ Next Halving 다음 반감기 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) 최소 수수료의 2배 또는 낮은 우선 순위 금액(낮은 금액 선택) @@ -3325,7 +3425,7 @@ 채굴 src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3334,7 +3434,7 @@ 채굴풀 순위 src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3347,7 +3447,7 @@ 채굴풀 도미넌스 src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3359,7 +3459,7 @@ Hashrate & Difficulty src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3368,7 +3468,7 @@ 라이트닝 src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3377,7 +3477,7 @@ 네트워크당 라이트닝 노드 src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3397,7 +3497,7 @@ Lightning Network Capacity src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3417,7 +3517,7 @@ Lightning Nodes Per ISP src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3429,7 +3529,7 @@ Lightning Nodes Per Country src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3445,7 +3545,7 @@ Lightning Nodes World Map src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3461,7 +3561,7 @@ Lightning Nodes Channels World Map src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3482,11 +3582,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3515,11 +3615,11 @@ Hashrate (MA) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3638,7 +3738,7 @@ 보상 관련 데이터 src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3647,7 +3747,7 @@ (144 블록) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3656,7 +3756,7 @@ 최신 블록 src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3669,7 +3769,7 @@ 조정 src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3678,7 +3778,7 @@ 트랜잭션을 비트코인 네트워크에 전송하기 src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3845,9 +3945,8 @@ 58 - - blocks - 블록 + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3856,6 +3955,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4077,7 +4211,7 @@ src/app/components/transaction/transaction.component.html - 290,291 + 291,292 transaction.hex @@ -4295,7 +4429,7 @@ 필터 src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4304,7 +4438,7 @@ 뒤집기 src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4313,7 +4447,7 @@ 초당 트랜잭션 vByte (vB / s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4321,196 +4455,187 @@ Just now 방금 전 - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago 전 - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After 이후 - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - ~ 안에 - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4641,7 +4766,7 @@ src/app/components/transaction/transaction.component.html - 340,344 + 341,345 Transaction flow transaction.flow @@ -4659,7 +4784,7 @@ 더 보기 src/app/components/transaction/transaction.component.html - 225,227 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4676,7 +4801,7 @@ 숨기기 src/app/components/transaction/transaction.component.html - 227,233 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4689,7 +4814,7 @@ 도표 보기 src/app/components/transaction/transaction.component.html - 247,248 + 248,249 show-diagram @@ -4698,7 +4823,7 @@ 잠금 시간 src/app/components/transaction/transaction.component.html - 286,288 + 287,289 transaction.locktime @@ -4707,7 +4832,7 @@ 트랜잭션을 찾을 수 없음 src/app/components/transaction/transaction.component.html - 449,450 + 450,451 transaction.error.transaction-not-found @@ -4716,7 +4841,7 @@ 멤풀에 포함될때까지 대기하는 중... src/app/components/transaction/transaction.component.html - 450,455 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4725,7 +4850,7 @@ 유효 수수료율 src/app/components/transaction/transaction.component.html - 485,488 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -5164,13 +5289,17 @@ src/app/docs/api-docs/api-docs.component.html 13 + + src/app/docs/api-docs/api-docs.component.html + 14 + faq.big-disclaimer REST API service src/app/docs/api-docs/api-docs.component.html - 41,42 + 42,43 api-docs.title @@ -5179,11 +5308,11 @@ 엔드포인트 src/app/docs/api-docs/api-docs.component.html - 50,51 + 51,52 src/app/docs/api-docs/api-docs.component.html - 104,107 + 105,108 Api docs endpoint @@ -5192,11 +5321,11 @@ 설명 src/app/docs/api-docs/api-docs.component.html - 69,70 + 70,71 src/app/docs/api-docs/api-docs.component.html - 108,109 + 109,110 @@ -5204,7 +5333,7 @@ 기본 푸시: 작업: 'want', 데이터 : [ 'blocks', ...] 을 사용하여 푸시하려는 것을 표시할 수 있습니다. 사용 가능: blocks, mempool-blocks, live-2h-chart, 및stats.주소와 관련된 트랜잭션을 푸시:’track-address’: ‘3PbJ…bF9B’을 사용하여 인풋 또는 아웃풋 주소를 포함한 새로운 트랜잭션을 받을 수 있습니다. 트랜잭션들은 행렬로 반환합니다. 새로운 트랜잭션일 경우address-transactions이고, 새롭게 컨펌된 트랜잭션일 경우block-transactions입니다. src/app/docs/api-docs/api-docs.component.html - 109,110 + 110,111 api-docs.websocket.websocket @@ -5369,6 +5498,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5475,6 +5608,14 @@ src/app/lightning/channels-list/channels-list.component.html 43,46 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 + src/app/lightning/node-statistics/node-statistics.component.html 4,5 @@ -5589,7 +5730,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5717,7 +5858,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -5963,6 +6104,14 @@ src/app/lightning/group/group.component.html 40,44 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 + src/app/lightning/node-statistics/node-statistics.component.html 28,29 @@ -6011,6 +6160,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6454,25 +6607,29 @@ lightning.share - nodes + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 BTC capacity src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6578,11 +6735,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.lt.xlf b/frontend/src/locale/messages.lt.xlf index f809420b4..d10094194 100644 --- a/frontend/src/locale/messages.lt.xlf +++ b/frontend/src/locale/messages.lt.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1487,7 +1487,7 @@ Bendruomenės Aljansai src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Projekto Vertėjai src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Projekto Pagalbininkai src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Projekto Nariai src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Projekto Prižiūrėtojai src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -3094,7 +3094,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3767,7 +3767,7 @@ Atlygio statistika src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3776,7 +3776,7 @@ (144 blokai) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3785,7 +3785,7 @@ Naujausi blokai src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3798,7 +3798,7 @@ Koregavimai src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3807,7 +3807,7 @@ Transliuoti Sandorį src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3982,9 +3982,8 @@ 58 - - blocks - blokai + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3993,6 +3992,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -5539,6 +5573,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5779,7 +5817,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5920,7 +5958,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6238,6 +6276,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6718,19 +6760,22 @@ lightning.share - nodes - mazgai + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6738,7 +6783,7 @@ BTC talpumas src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6856,11 +6901,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.mk.xlf b/frontend/src/locale/messages.mk.xlf index 7ee9b19ae..9b2cbd58f 100644 --- a/frontend/src/locale/messages.mk.xlf +++ b/frontend/src/locale/messages.mk.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1487,7 +1487,7 @@ Соработка со Заедницата src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Преведувачи src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Контрибутори src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Членови на проектот src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Одржувачи на проектот src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -3094,7 +3094,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3778,7 +3778,7 @@ Статистика за награди src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3787,7 +3787,7 @@ (144 блока) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3796,7 +3796,7 @@ Последни блокови src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3809,7 +3809,7 @@ Промени src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3818,7 +3818,7 @@ Емитирај ја Трансакцијата src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3993,9 +3993,8 @@ 58 - - blocks - блока + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -4004,6 +4003,42 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + Други () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -5551,6 +5586,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5791,7 +5830,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5932,7 +5971,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6250,6 +6289,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6730,19 +6773,23 @@ lightning.share - nodes - нодови + nodes + нодови src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6750,7 +6797,7 @@ BTC капацитет src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6868,11 +6915,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.nb.xlf b/frontend/src/locale/messages.nb.xlf index 3786617b7..d4fdbce21 100644 --- a/frontend/src/locale/messages.nb.xlf +++ b/frontend/src/locale/messages.nb.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1074,7 +1074,7 @@ src/app/components/transaction/transaction.component.html - 282,284 + 283,285 transaction.version @@ -1202,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 256,261 + 257,262 src/app/components/transaction/transaction.component.html - 400,406 + 401,407 transaction.details @@ -1223,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 243,247 + 244,248 src/app/components/transaction/transaction.component.html - 371,377 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1245,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 244,243 + 246,245 @@ -1487,7 +1487,7 @@ Samfunnsallianser src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Oversettere src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Bidragsytere til prosjektet src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Prosjektmedlemmer src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Prosjektvedlikeholdere src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -1581,7 +1581,7 @@ src/app/components/amount/amount.component.html - 20,23 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -2044,7 +2044,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2093,7 +2093,7 @@ src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2114,7 +2114,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2155,7 +2155,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2181,7 +2181,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/transactions-list/transactions-list.component.html @@ -2203,7 +2203,7 @@ src/app/components/transaction/transaction.component.html - 475,477 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2297,11 +2297,11 @@ src/app/components/transaction/transaction.component.html - 477,480 + 478,481 src/app/components/transaction/transaction.component.html - 488,490 + 489,491 src/app/components/transactions-list/transactions-list.component.html @@ -2331,7 +2331,7 @@ src/app/components/transaction/transaction.component.html - 268,271 + 269,272 Transaction Virtual Size transaction.vsize @@ -2407,7 +2407,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2448,7 +2448,7 @@ src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2465,7 +2465,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2506,7 +2506,7 @@ src/app/components/transaction/transaction.component.html - 264,266 + 265,267 src/app/dashboard/dashboard.component.html @@ -2534,7 +2534,7 @@ src/app/components/transaction/transaction.component.html - 272,274 + 273,275 @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2846,11 +2850,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2891,7 +2895,7 @@ src/app/components/transaction/transaction.component.html - 248,253 + 249,254 src/app/lightning/channel/channel.component.html @@ -3080,13 +3084,17 @@ Difficulty Adjustment Vanskelighetsgradjustering + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3094,11 +3102,11 @@ Remaining Gjenstående - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3115,11 @@ blocks blokker - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3132,11 +3140,11 @@ block blokk - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3149,11 +3157,11 @@ Estimate Anslag - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3162,20 +3170,24 @@ Previous Forrige - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Nåværende periode - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3184,11 +3196,99 @@ Next Halving Neste halvering - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) Enten 2x av minimum eller lav prioritetsrate (den som er lavest) @@ -3346,7 +3446,7 @@ Utvinning src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3355,7 +3455,7 @@ Utvinningsgruppe-rangering src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3368,7 +3468,7 @@ Utvinningsgruppe-dominans src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3381,7 +3481,7 @@ Hashrate og vanskelighetsgrad src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3390,7 +3490,7 @@ Lightning src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3399,7 +3499,7 @@ Lightning-noder per nettverk src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3420,7 +3520,7 @@ Lightningnettverk-kapasitet src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3441,7 +3541,7 @@ Lightning-noder per ISP src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3454,7 +3554,7 @@ Lightning-noder per land src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3471,7 +3571,7 @@ Lightning-noder verdenskart src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3488,7 +3588,7 @@ Lightning-kanaler Verdenskart src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3509,11 +3609,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3543,11 +3643,11 @@ Hashrate (MA) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3667,7 +3767,7 @@ Belonnings-statistikk src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3676,7 +3776,7 @@ (144 blokker) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3685,7 +3785,7 @@ Nyeste blokker src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3698,7 +3798,7 @@ Justeringer src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3707,7 +3807,7 @@ Send transaksjon src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3882,9 +3982,8 @@ 58 - - blocks - blokker + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3893,6 +3992,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4115,7 +4249,7 @@ src/app/components/transaction/transaction.component.html - 290,291 + 291,292 transaction.hex @@ -4339,7 +4473,7 @@ Filter src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4348,7 +4482,7 @@ Inverter src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4357,7 +4491,7 @@ Transaksjoner per sekund (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4365,196 +4499,187 @@ Just now Akkurat nå - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago siden - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After Etter - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - Om ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4688,7 +4813,7 @@ src/app/components/transaction/transaction.component.html - 340,344 + 341,345 Transaction flow transaction.flow @@ -4707,7 +4832,7 @@ Vis mer src/app/components/transaction/transaction.component.html - 225,227 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4724,7 +4849,7 @@ Vis mindre src/app/components/transaction/transaction.component.html - 227,233 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4737,7 +4862,7 @@ Vis diagram src/app/components/transaction/transaction.component.html - 247,248 + 248,249 show-diagram @@ -4746,7 +4871,7 @@ Locktime src/app/components/transaction/transaction.component.html - 286,288 + 287,289 transaction.locktime @@ -4755,7 +4880,7 @@ Transaksjon ikke funnet src/app/components/transaction/transaction.component.html - 449,450 + 450,451 transaction.error.transaction-not-found @@ -4764,7 +4889,7 @@ Venter på at den kommer inn i mempool... src/app/components/transaction/transaction.component.html - 450,455 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4773,7 +4898,7 @@ Effektiv avgift src/app/components/transaction/transaction.component.html - 485,488 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -5228,6 +5353,10 @@ src/app/docs/api-docs/api-docs.component.html 13 + + src/app/docs/api-docs/api-docs.component.html + 14 + faq.big-disclaimer @@ -5235,7 +5364,7 @@ REST API-tjeneste src/app/docs/api-docs/api-docs.component.html - 41,42 + 42,43 api-docs.title @@ -5244,11 +5373,11 @@ Endepunkt src/app/docs/api-docs/api-docs.component.html - 50,51 + 51,52 src/app/docs/api-docs/api-docs.component.html - 104,107 + 105,108 Api docs endpoint @@ -5257,11 +5386,11 @@ Beskrivelse src/app/docs/api-docs/api-docs.component.html - 69,70 + 70,71 src/app/docs/api-docs/api-docs.component.html - 108,109 + 109,110 @@ -5269,7 +5398,7 @@ Standard push: handling: 'want', data: ['blocks', ...] for å uttrykke hva du vil ha pushet. Tilgjengelig: blocks , mempool-blocks , live-2h-chart , og stats . Push-transaksjoner relatert til adresse: 'track-address': '3PbJ...bF9B' for å motta alle nye transaksjoner som inneholder den adressen som inngang eller utgang. Returnerer en tabell av transaksjoner. adress-transactions for nye mempool-transaksjoner, og block-transactions for nye blokkbekreftede transaksjoner. src/app/docs/api-docs/api-docs.component.html - 109,110 + 110,111 api-docs.websocket.websocket @@ -5444,6 +5573,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5558,6 +5691,14 @@ src/app/lightning/channels-list/channels-list.component.html 43,46 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 + src/app/lightning/node-statistics/node-statistics.component.html 4,5 @@ -5676,7 +5817,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5817,7 +5958,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6079,6 +6220,14 @@ src/app/lightning/group/group.component.html 40,44 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 + src/app/lightning/node-statistics/node-statistics.component.html 28,29 @@ -6127,6 +6276,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6607,19 +6760,22 @@ lightning.share - nodes - noder + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6627,7 +6783,7 @@ BTC-kapasitet src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6745,11 +6901,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.ne.xlf b/frontend/src/locale/messages.ne.xlf index 92be31844..1408a0225 100644 --- a/frontend/src/locale/messages.ne.xlf +++ b/frontend/src/locale/messages.ne.xlf @@ -357,11 +357,11 @@ src/app/components/block/block.component.html - 290,291 + 310,311 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 26,27 + 46,47 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -382,11 +382,11 @@ src/app/components/block/block.component.html - 291,292 + 311,312 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 27,28 + 47,48 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -424,7 +424,7 @@ src/app/components/block/block.component.html - 40,41 + 38,39 block.hash @@ -449,7 +449,7 @@ src/app/components/block/block.component.html - 44,46 + 42,44 src/app/components/blocks-list/blocks-list.component.html @@ -592,11 +592,11 @@ src/app/components/master-page/master-page.component.html - 49,51 + 48,50 src/app/components/pool-ranking/pool-ranking.component.html - 94,96 + 94,95 @@ -748,11 +748,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -773,16 +773,24 @@ src/app/components/about/about.component.html - 385,389 + 391,394 + + + src/app/components/mining-dashboard/mining-dashboard.component.html + 87 src/app/dashboard/dashboard.component.html - 150,152 + 157,159 src/app/docs/docs/docs.component.html 51 + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 97 + Terms of Service shared.terms-of-service @@ -793,14 +801,22 @@ src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html 113,120 + + src/app/components/mining-dashboard/mining-dashboard.component.html + 89 + src/app/dashboard/dashboard.component.html - 152,154 + 159,161 src/app/docs/docs/docs.component.html 53 + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 99 + Privacy Policy shared.privacy-policy @@ -988,7 +1004,7 @@ src/app/dashboard/dashboard.component.html - 124,125 + 124,126 @@ -1036,7 +1052,7 @@ src/app/components/transaction/transaction.component.html - 158,160 + 152,154 src/app/components/transactions-list/transactions-list.component.html @@ -1052,11 +1068,11 @@ src/app/components/block/block.component.html - 246,247 + 252,253 src/app/components/transaction/transaction.component.html - 288,290 + 283,285 transaction.version @@ -1106,7 +1122,7 @@ src/app/components/transactions-list/transactions-list.component.html - 294,295 + 296,297 Transaction singular confirmation count shared.confirmation-count.singular @@ -1128,7 +1144,7 @@ src/app/components/transactions-list/transactions-list.component.html - 295,296 + 297,298 Transaction plural confirmation count shared.confirmation-count.plural @@ -1140,10 +1156,6 @@ src/app/bisq/bisq-transaction/bisq-transaction.component.html 43,45 - - src/app/components/transaction/transaction.component.html - 65,67 - Transaction included in block transaction.included-in-block @@ -1156,11 +1168,11 @@ src/app/components/transaction/transaction.component.html - 77,80 + 71,74 src/app/components/transaction/transaction.component.html - 135,138 + 129,132 Transaction features transaction.features @@ -1188,11 +1200,11 @@ src/app/components/transaction/transaction.component.html - 262,267 + 257,262 src/app/components/transaction/transaction.component.html - 406,412 + 401,407 transaction.details @@ -1209,11 +1221,11 @@ src/app/components/transaction/transaction.component.html - 249,253 + 244,248 src/app/components/transaction/transaction.component.html - 377,383 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1231,7 +1243,7 @@ src/app/components/transaction/transaction.component.ts - 241,240 + 246,245 @@ -1251,7 +1263,7 @@ src/app/components/transaction/transaction.component.html - 159,160 + 153,154 src/app/dashboard/dashboard.component.html @@ -1267,7 +1279,7 @@ src/app/components/transaction/transaction.component.html - 72,73 + 66,67 Transaction Confirmed state transaction.confirmed @@ -1438,7 +1450,7 @@ Bitcoin समुदायको लागि हाम्रो mempool र blockchain अन्वेषक, लेनदेन शुल्क बजार र बहु-तह इकोसिस्टममा ध्यान केन्द्रित गर्दै, कुनै पनि विश्वसनीय तेस्रो-पक्ष बिना पूर्ण रूपमा स्व-होस्ट गरिएको। src/app/components/about/about.component.html - 13,17 + 13,16 @@ -1446,7 +1458,7 @@ एंटरप्राइज़ प्रायोजक 🚀 src/app/components/about/about.component.html - 29,32 + 19,22 about.sponsors.enterprise.withRocket @@ -1455,7 +1467,7 @@ समुदाय प्रायोजक ❤️ src/app/components/about/about.component.html - 177,180 + 167,170 about.sponsors.withHeart @@ -1464,7 +1476,7 @@ समुदाय एकीकरण src/app/components/about/about.component.html - 191,193 + 181,183 about.community-integrations @@ -1473,7 +1485,7 @@ सामुदायिक गठबन्धनहरू src/app/components/about/about.component.html - 285,287 + 291,293 about.alliances @@ -1482,7 +1494,7 @@ परियोजना अनुवादकहरू src/app/components/about/about.component.html - 301,303 + 307,309 about.translators @@ -1491,7 +1503,7 @@ परियोजना योगदानकर्ताहरू src/app/components/about/about.component.html - 315,317 + 321,323 about.contributors @@ -1500,7 +1512,7 @@ परियोजना सदस्यहरू src/app/components/about/about.component.html - 327,329 + 333,335 about.project_members @@ -1509,7 +1521,7 @@ परियोजना संरक्षकहरू src/app/components/about/about.component.html - 340,342 + 346,348 about.maintainers @@ -1518,7 +1530,7 @@ विवरण src/app/components/about/about.component.ts - 39 + 42 src/app/components/bisq-master-page/bisq-master-page.component.html @@ -1530,7 +1542,7 @@ src/app/components/master-page/master-page.component.html - 58,61 + 57,60 @@ -1567,7 +1579,7 @@ src/app/components/amount/amount.component.html - 6,9 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -1583,7 +1595,7 @@ src/app/components/transactions-list/transactions-list.component.html - 302,304 + 304,306 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -1665,7 +1677,7 @@ src/app/components/assets/assets.component.html - 29,31 + 31,33 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -1886,7 +1898,7 @@ src/app/components/assets/assets.component.html - 30,31 + 32,33 Asset ticker header @@ -1899,7 +1911,7 @@ src/app/components/assets/assets.component.html - 31,34 + 33,36 Asset Issuer Domain header @@ -1912,7 +1924,7 @@ src/app/components/assets/assets.component.html - 32,36 + 34,38 Asset ID header @@ -1921,7 +1933,7 @@ एसेट/सम्पत्ति डेटा लोड गर्दा त्रुटि। src/app/components/assets/assets.component.html - 48,53 + 50,55 Asset data load error @@ -2028,7 +2040,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2045,7 +2057,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 161 + 165 @@ -2061,7 +2073,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 163 + 167 @@ -2073,11 +2085,11 @@ src/app/components/block-fees-graph/block-fees-graph.component.ts - 62 + 67 src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2085,19 +2097,19 @@ Indexing blocks src/app/components/block-fees-graph/block-fees-graph.component.ts - 110,105 + 116,111 src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 108,103 + 113,108 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 115,110 + 116,111 src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2137,7 +2149,7 @@ src/app/components/transaction/transaction.component.html - 476 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2163,11 +2175,11 @@ src/app/components/transaction/transaction.component.html - 476,477 + 473 src/app/components/transactions-list/transactions-list.component.html - 286,287 + 288 sat shared.sat @@ -2181,11 +2193,11 @@ src/app/components/transaction/transaction.component.html - 161,165 + 155,159 src/app/components/transaction/transaction.component.html - 479,481 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2197,7 +2209,7 @@ src/app/lightning/channels-list/channels-list.component.html - 38,39 + 41,43 Transaction fee rate transaction.fee-rate @@ -2215,19 +2227,19 @@ src/app/components/block/block.component.html - 125,128 + 124,127 src/app/components/block/block.component.html - 129 + 128,130 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 12,14 + 19,22 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 15,17 + 30,33 src/app/components/fees-box/fees-box.component.html @@ -2267,27 +2279,27 @@ src/app/components/transaction/transaction.component.html - 173,174 + 167,168 src/app/components/transaction/transaction.component.html - 184,185 + 178,179 src/app/components/transaction/transaction.component.html - 195,196 + 189,190 src/app/components/transaction/transaction.component.html - 481,484 + 478,481 src/app/components/transaction/transaction.component.html - 492,494 + 489,491 src/app/components/transactions-list/transactions-list.component.html - 286 + 286,287 src/app/dashboard/dashboard.component.html @@ -2295,7 +2307,7 @@ src/app/dashboard/dashboard.component.html - 204,208 + 213,217 sat/vB shared.sat-vbyte @@ -2309,11 +2321,11 @@ src/app/components/transaction/transaction.component.html - 160,162 + 154,156 src/app/components/transaction/transaction.component.html - 274,277 + 269,272 Transaction Virtual Size transaction.vsize @@ -2384,7 +2396,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2421,11 +2433,11 @@ src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 60 + 65 src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2442,7 +2454,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2451,15 +2463,15 @@ साइज src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 180,179 + 184,183 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 226,224 + 239,237 src/app/components/block/block.component.html - 50,52 + 48,50 src/app/components/blocks-list/blocks-list.component.html @@ -2483,7 +2495,7 @@ src/app/components/transaction/transaction.component.html - 270,272 + 265,267 src/app/dashboard/dashboard.component.html @@ -2495,11 +2507,11 @@ वजन src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 188,187 + 192,191 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 257,254 + 270,267 src/app/components/block/block-preview.component.html @@ -2507,11 +2519,22 @@ src/app/components/block/block.component.html - 54,56 + 52,54 src/app/components/transaction/transaction.component.html - 278,280 + 273,275 + + + + Size per weight + + src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts + 200,199 + + + src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts + 282,279 @@ -2527,15 +2550,6 @@ shared.block-title - - - - - src/app/components/block/block-preview.component.html - 11,12 - - shared.block-title - Median fee मध्य शुल्क @@ -2545,7 +2559,7 @@ src/app/components/block/block.component.html - 128,129 + 127,128 src/app/components/mempool-block/mempool-block.component.html @@ -2562,11 +2576,11 @@ src/app/components/block/block.component.html - 133,135 + 138,140 src/app/components/block/block.component.html - 159,162 + 164,167 src/app/components/mempool-block/mempool-block.component.html @@ -2584,7 +2598,7 @@ src/app/components/block/block.component.html - 168,170 + 173,175 block.miner @@ -2597,7 +2611,7 @@ src/app/components/block/block.component.ts - 227 + 242 @@ -2607,6 +2621,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2622,32 +2640,48 @@ Previous Block - - Block health + + Health src/app/components/block/block.component.html - 58,61 + 56 - block.health + + src/app/components/blocks-list/blocks-list.component.html + 18,19 + + + src/app/components/blocks-list/blocks-list.component.html + 18,19 + + latest-blocks.health Unknown अज्ञात src/app/components/block/block.component.html - 69,72 + 67,70 src/app/components/blocks-list/blocks-list.component.html 60,63 - src/app/lightning/node/node.component.html - 52,55 + src/app/components/pool-ranking/pool-ranking.component.html + 121,124 + + + src/app/lightning/channel/closing-type/closing-type.component.ts + 32 src/app/lightning/node/node.component.html - 96,100 + 55,58 + + + src/app/lightning/node/node.component.html + 99,103 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts @@ -2664,7 +2698,7 @@ शुल्क अवधि src/app/components/block/block.component.html - 124,125 + 123,124 src/app/components/mempool-block/mempool-block.component.html @@ -2677,7 +2711,7 @@ 140 vBytes नेटिव सेगविट ट्रांसेक्शन सरदर को अनुसार src/app/components/block/block.component.html - 129,131 + 131,136 src/app/components/fees-box/fees-box.component.html @@ -2701,49 +2735,60 @@ Transaction fee tooltip - - Subsidy + fees: - अनुदान + शुल्क: + + Subsidy + fees src/app/components/block/block.component.html - 148,151 + 153,156 src/app/components/block/block.component.html - 163,167 + 168,172 Total subsidy and fees in a block block.subsidy-and-fees - - Projected + + Expected src/app/components/block/block.component.html - 210,212 + 216 - block.projected + block.expected + + + beta + + src/app/components/block/block.component.html + 216,217 + + + src/app/components/block/block.component.html + 222,224 + + beta Actual src/app/components/block/block.component.html - 212,216 + 218,222 block.actual - - Projected Block + + Expected Block src/app/components/block/block.component.html - 216,218 + 222 - block.projected-block + block.expected-block Actual Block src/app/components/block/block.component.html - 225,227 + 231 block.actual-block @@ -2752,7 +2797,7 @@ बिट्स src/app/components/block/block.component.html - 250,252 + 256,258 block.bits @@ -2761,7 +2806,7 @@ मर्कल रुट src/app/components/block/block.component.html - 254,256 + 260,262 block.merkle-root @@ -2770,7 +2815,7 @@ कठिनाई src/app/components/block/block.component.html - 265,268 + 271,274 src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html @@ -2786,11 +2831,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2799,7 +2844,7 @@ नोन्स src/app/components/block/block.component.html - 269,271 + 275,277 block.nonce @@ -2808,32 +2853,41 @@ ब्लक हेडर हेक्स src/app/components/block/block.component.html - 273,274 + 279,280 block.header + + Audit + + src/app/components/block/block.component.html + 297,301 + + Toggle Audit + block.toggle-audit + Details विवरण src/app/components/block/block.component.html - 284,288 + 304,308 src/app/components/transaction/transaction.component.html - 254,259 + 249,254 src/app/lightning/channel/channel.component.html - 86,88 + 93,95 src/app/lightning/channel/channel.component.html - 96,98 + 103,105 src/app/lightning/node/node.component.html - 218,222 + 221,225 Transaction Details transaction.details @@ -2843,20 +2897,16 @@ डाटा लोड गर्दा त्रुटि भयो। src/app/components/block/block.component.html - 303,305 + 323,325 src/app/components/block/block.component.html - 339,343 + 362,366 src/app/lightning/channel/channel-preview.component.html 70,75 - - src/app/lightning/channel/channel.component.html - 109,115 - src/app/lightning/node/node-preview.component.html 66,69 @@ -2871,7 +2921,7 @@ Why is this block empty? src/app/components/block/block.component.html - 361,367 + 384,390 block.empty-block-explanation @@ -2917,18 +2967,6 @@ latest-blocks.mined - - Health - - src/app/components/blocks-list/blocks-list.component.html - 18,19 - - - src/app/components/blocks-list/blocks-list.component.html - 18,19 - - latest-blocks.health - Reward इनाम @@ -2992,7 +3030,7 @@ src/app/dashboard/dashboard.component.html - 210,214 + 219,223 dashboard.txs @@ -3025,13 +3063,17 @@ Difficulty Adjustment कठिनाई समायोजन / डिफीकल्टी एडजस्टमेंट + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3039,11 +3081,11 @@ Remaining बाँकी - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3052,11 +3094,11 @@ blocks ब्लकहरू - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3077,11 +3119,11 @@ block ब्लक - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3094,11 +3136,11 @@ Estimate अनुमान - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3107,20 +3149,24 @@ Previous अघिल्लो - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period वर्तमान अवधि - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3129,11 +3175,99 @@ Next Halving अर्को हल्विंग - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) या त 2x न्यूनतम, वा कम प्राथमिकता दर (जुन कम छ) @@ -3231,7 +3365,7 @@ src/app/dashboard/dashboard.component.html - 237,238 + 246,247 dashboard.incoming-transactions @@ -3244,7 +3378,7 @@ src/app/dashboard/dashboard.component.html - 240,243 + 249,252 dashboard.backend-is-synchronizing @@ -3256,7 +3390,7 @@ src/app/dashboard/dashboard.component.html - 245,250 + 254,259 vB/s shared.vbytes-per-second @@ -3270,7 +3404,7 @@ src/app/dashboard/dashboard.component.html - 208,209 + 217,218 Unconfirmed count dashboard.unconfirmed @@ -3290,7 +3424,7 @@ माईनिंग src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3299,7 +3433,7 @@ पूल रैंकिंग src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3312,7 +3446,7 @@ पूल सर्वोच्चता src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3325,7 +3459,7 @@ हैसरेट र कठिनाई src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3334,7 +3468,7 @@ लाइटनिंग src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3342,7 +3476,7 @@ Lightning Nodes Per Network src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3363,7 +3497,7 @@ लाइटनिंग नेटवर्क क्षमता src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3384,7 +3518,7 @@ प्रति ISP लाइटनिंग नोडहरू src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3397,7 +3531,7 @@ प्रति देश लाइटनिंग नोड्स src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3414,7 +3548,7 @@ लाइटनिंग नोड्स विश्व नक्सा src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3431,7 +3565,7 @@ लाइटनिङ नोड्स च्यानल विश्व नक्सा src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3452,11 +3586,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3486,11 +3620,11 @@ हसरेट (एमए) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3524,7 +3658,7 @@ src/app/components/master-page/master-page.component.html - 52,54 + 51,53 src/app/components/statistics/statistics.component.ts @@ -3550,7 +3684,7 @@ लाइटनिङ एक्सप्लोरर src/app/components/master-page/master-page.component.html - 44,45 + 44,47 src/app/lightning/lightning-dashboard/lightning-dashboard.component.ts @@ -3558,20 +3692,12 @@ master-page.lightning - - beta - - src/app/components/master-page/master-page.component.html - 45,48 - - beta - Documentation कागजात src/app/components/master-page/master-page.component.html - 55,57 + 54,56 src/app/docs/docs/docs.component.html @@ -3616,7 +3742,7 @@ इनाम तथ्याङ्क src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3625,7 +3751,7 @@ (144 ब्लकहरू) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3634,7 +3760,7 @@ भर्खरका ब्लकहरू src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3647,10 +3773,36 @@ समायोजनहरू src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments + + Broadcast Transaction + ट्रांसेक्शन प्रसारण गर्नुहोस् + + src/app/components/mining-dashboard/mining-dashboard.component.html + 91 + + + src/app/components/push-transaction/push-transaction.component.html + 2 + + + src/app/components/push-transaction/push-transaction.component.html + 8 + + + src/app/dashboard/dashboard.component.html + 161,169 + + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 102 + + Broadcast Transaction + shared.broadcast-transaction + Pools luck (1 week) पूल भाग्य (1 हप्ता) @@ -3717,7 +3869,7 @@ src/app/components/pool-ranking/pool-ranking.component.html - 136,138 + 152,154 master-page.blocks @@ -3747,12 +3899,24 @@ mining.rank + + Avg Health + + src/app/components/pool-ranking/pool-ranking.component.html + 96,97 + + + src/app/components/pool-ranking/pool-ranking.component.html + 96,98 + + latest-blocks.avg_health + Empty blocks खाली ब्लकहरू src/app/components/pool-ranking/pool-ranking.component.html - 95,98 + 97,100 mining.empty-blocks @@ -3761,7 +3925,7 @@ सबै माईनर्स हरू src/app/components/pool-ranking/pool-ranking.component.html - 113,114 + 129,130 mining.all-miners @@ -3770,7 +3934,7 @@ पूल भाग्य (1w) src/app/components/pool-ranking/pool-ranking.component.html - 130,132 + 146,148 mining.miners-luck @@ -3779,7 +3943,7 @@ पूल गणना (1w) src/app/components/pool-ranking/pool-ranking.component.html - 142,144 + 158,160 mining.miners-count @@ -3788,12 +3952,11 @@ माईनिंग पुलहरू src/app/components/pool-ranking/pool-ranking.component.ts - 57 + 58 - - blocks - ब्लकहरू + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3802,6 +3965,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4013,24 +4211,6 @@ latest-blocks.coinbasetag - - Broadcast Transaction - ट्रांसेक्शन प्रसारण गर्नुहोस् - - src/app/components/push-transaction/push-transaction.component.html - 2 - - - src/app/components/push-transaction/push-transaction.component.html - 8 - - - src/app/dashboard/dashboard.component.html - 154,161 - - Broadcast Transaction - shared.broadcast-transaction - Transaction hex ट्रांसेक्शन हेक्स @@ -4040,7 +4220,7 @@ src/app/components/transaction/transaction.component.html - 296,297 + 291,292 transaction.hex @@ -4161,6 +4341,70 @@ search-form.search-title + + Bitcoin Block Height + + src/app/components/search-form/search-results/search-results.component.html + 3 + + search.bitcoin-block-height + + + Bitcoin Transaction + + src/app/components/search-form/search-results/search-results.component.html + 9 + + search.bitcoin-transaction + + + Bitcoin Address + + src/app/components/search-form/search-results/search-results.component.html + 15 + + search.bitcoin-address + + + Bitcoin Block + + src/app/components/search-form/search-results/search-results.component.html + 21 + + search.bitcoin-block + + + Bitcoin Addresses + + src/app/components/search-form/search-results/search-results.component.html + 27 + + search.bitcoin-addresses + + + Lightning Nodes + + src/app/components/search-form/search-results/search-results.component.html + 35 + + search.lightning-nodes + + + Lightning Channels + + src/app/components/search-form/search-results/search-results.component.html + 43 + + search.lightning-channels + + + Go to "" + + src/app/components/search-form/search-results/search-results.component.html + 52 + + search.go-to + Mempool by vBytes (sat/vByte) vBytes द्वारा मेम्पपुल (sat/vByte) @@ -4188,7 +4432,7 @@ फिल्टर src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4197,7 +4441,7 @@ उल्टो src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4206,7 +4450,7 @@ ट्रांसेक्शन vBytes प्रति सेकेन्ड (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4214,196 +4458,187 @@ Just now भर्खरै - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago पहिले - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After पछि - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - ~ मा - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4443,7 +4678,7 @@ src/app/components/transactions-list/transactions-list.component.html - 298,301 + 300,303 Transaction unconfirmed state transaction.unconfirmed @@ -4453,11 +4688,11 @@ पहिलो पटक देखियो src/app/components/transaction/transaction.component.html - 108,109 + 102,103 src/app/lightning/node/node.component.html - 67,70 + 70,73 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -4473,11 +4708,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 13,15 + 15,16 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 13,15 + 15,16 Transaction first seen transaction.first-seen @@ -4487,7 +4722,7 @@ अनुमानित समय src/app/components/transaction/transaction.component.html - 115,116 + 109,110 Transaction ETA transaction.eta @@ -4497,7 +4732,7 @@ केहि घण्टामा (वा बढी) src/app/components/transaction/transaction.component.html - 121,124 + 115,118 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -4507,11 +4742,11 @@ वंशज src/app/components/transaction/transaction.component.html - 168,170 + 162,164 src/app/components/transaction/transaction.component.html - 179,181 + 173,175 Descendant transaction.descendant @@ -4521,7 +4756,7 @@ पुर्खा src/app/components/transaction/transaction.component.html - 190,192 + 184,186 Transaction Ancestor transaction.ancestor @@ -4531,11 +4766,11 @@ प्रवाह src/app/components/transaction/transaction.component.html - 208,211 + 202,205 src/app/components/transaction/transaction.component.html - 346,350 + 341,345 Transaction flow transaction.flow @@ -4545,7 +4780,7 @@ रेखाचित्र लुकाउनुहोस् src/app/components/transaction/transaction.component.html - 211,216 + 205,210 hide-diagram @@ -4554,7 +4789,7 @@ थप देखाउनुहोस् src/app/components/transaction/transaction.component.html - 231,233 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4571,7 +4806,7 @@ कम देखाउनुहोस् src/app/components/transaction/transaction.component.html - 233,239 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4584,7 +4819,7 @@ रेखाचित्र देखाउनुहोस् src/app/components/transaction/transaction.component.html - 253,254 + 248,249 show-diagram @@ -4593,7 +4828,7 @@ लकटाइम src/app/components/transaction/transaction.component.html - 292,294 + 287,289 transaction.locktime @@ -4602,7 +4837,7 @@ ट्रांसेक्शन फेला परेन। src/app/components/transaction/transaction.component.html - 455,456 + 450,451 transaction.error.transaction-not-found @@ -4611,7 +4846,7 @@ मेम्पपुल मा देखिन को लागी प्रतिक्षा गर्दै ... src/app/components/transaction/transaction.component.html - 456,461 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4620,7 +4855,7 @@ प्रभावकारी शुल्क दर src/app/components/transaction/transaction.component.html - 489,492 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -4768,7 +5003,7 @@ Show more inputs to reveal fee data src/app/components/transactions-list/transactions-list.component.html - 288,291 + 290,293 transactions-list.load-to-reveal-fee-info @@ -4776,7 +5011,7 @@ remaining src/app/components/transactions-list/transactions-list.component.html - 330,331 + 332,333 x-remaining @@ -5026,21 +5261,12 @@ dashboard.latest-transactions - - USD - USD / अमेरिकी डलर - - src/app/dashboard/dashboard.component.html - 126,127 - - dashboard.latest-transactions.USD - Minimum fee न्यूनतम शुल्क src/app/dashboard/dashboard.component.html - 201,202 + 210,211 Minimum mempool fee dashboard.minimum-fee @@ -5050,7 +5276,7 @@ पर्जिंग / सफा src/app/dashboard/dashboard.component.html - 202,203 + 211,212 Purgin below fee dashboard.purging @@ -5060,7 +5286,7 @@ मेमोरी उपयोग src/app/dashboard/dashboard.component.html - 214,215 + 223,224 Memory usage dashboard.memory-usage @@ -5069,15 +5295,27 @@ L-BTC in circulation src/app/dashboard/dashboard.component.html - 228,230 + 237,239 dashboard.lbtc-pegs-in-circulation + + mempool.space merely provides data about the Bitcoin network. It cannot help you with retrieving funds, confirming your transaction quicker, etc. + + src/app/docs/api-docs/api-docs.component.html + 13 + + + src/app/docs/api-docs/api-docs.component.html + 14 + + faq.big-disclaimer + REST API service src/app/docs/api-docs/api-docs.component.html - 39,40 + 42,43 api-docs.title @@ -5085,11 +5323,11 @@ Endpoint src/app/docs/api-docs/api-docs.component.html - 48,49 + 51,52 src/app/docs/api-docs/api-docs.component.html - 102,105 + 105,108 Api docs endpoint @@ -5098,18 +5336,18 @@ विवरण src/app/docs/api-docs/api-docs.component.html - 67,68 + 70,71 src/app/docs/api-docs/api-docs.component.html - 106,107 + 109,110 Default push: action: 'want', data: ['blocks', ...] to express what you want pushed. Available: blocks, mempool-blocks, live-2h-chart, and stats.Push transactions related to address: 'track-address': '3PbJ...bF9B' to receive all new transactions containing that address as input or output. Returns an array of transactions. address-transactions for new mempool transactions, and block-transactions for new block confirmed transactions. src/app/docs/api-docs/api-docs.component.html - 107,108 + 110,111 api-docs.websocket.websocket @@ -5202,7 +5440,7 @@ src/app/lightning/node/node.component.html - 180,182 + 183,185 shared.m-sats @@ -5275,7 +5513,11 @@ src/app/lightning/channels-list/channels-list.component.html - 120,121 + 123,124 + + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 lightning.x-channels @@ -5315,11 +5557,11 @@ src/app/lightning/channel/channel.component.html - 11,12 + 13,14 src/app/lightning/channels-list/channels-list.component.html - 65,66 + 68,69 status.inactive @@ -5332,11 +5574,11 @@ src/app/lightning/channel/channel.component.html - 12,13 + 14,15 src/app/lightning/channels-list/channels-list.component.html - 66,68 + 69,71 status.active @@ -5349,7 +5591,7 @@ src/app/lightning/channel/channel.component.html - 13,14 + 15,16 src/app/lightning/channels-list/channels-list.component.html @@ -5357,7 +5599,7 @@ src/app/lightning/channels-list/channels-list.component.html - 68,70 + 71,73 status.closed @@ -5370,7 +5612,7 @@ src/app/lightning/channel/channel.component.html - 29,30 + 36,37 lightning.created @@ -5383,11 +5625,19 @@ src/app/lightning/channel/channel.component.html - 48,49 + 55,56 src/app/lightning/channels-list/channels-list.component.html - 40,43 + 43,46 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 src/app/lightning/node-statistics/node-statistics.component.html @@ -5395,7 +5645,7 @@ src/app/lightning/node-statistics/node-statistics.component.html - 47,50 + 46,49 src/app/lightning/nodes-list/nodes-list.component.html @@ -5417,6 +5667,10 @@ src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 60,62 + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 13,14 + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 202,201 @@ -5452,11 +5706,11 @@ लाइटनिंग च्यानल src/app/lightning/channel/channel.component.html - 2,5 + 4,7 src/app/lightning/channel/channel.component.html - 117,119 + 116,118 lightning.channel @@ -5465,11 +5719,11 @@ अन्तिम अपडेट src/app/lightning/channel/channel.component.html - 33,34 + 40,41 src/app/lightning/node/node.component.html - 73,75 + 76,78 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5485,11 +5739,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 14,15 + 16,17 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 14,15 + 16,17 lightning.last-update @@ -5498,11 +5752,11 @@ बन्द हुने मिति src/app/lightning/channel/channel.component.html - 37,38 + 44,45 src/app/lightning/channels-list/channels-list.component.html - 39,40 + 42,44 lightning.closing_date @@ -5510,7 +5764,7 @@ Closed by src/app/lightning/channel/channel.component.html - 52,54 + 59,61 lightning.closed_by @@ -5519,7 +5773,7 @@ ट्रांसेक्शन खोल्दै src/app/lightning/channel/channel.component.html - 84,85 + 91,92 lightning.opening-transaction @@ -5528,7 +5782,7 @@ बन्द ट्रांसेक्शन src/app/lightning/channel/channel.component.html - 93,95 + 100,102 lightning.closing-transaction @@ -5540,6 +5794,27 @@ 37 + + Mutually closed + + src/app/lightning/channel/closing-type/closing-type.component.ts + 20 + + + + Force closed + + src/app/lightning/channel/closing-type/closing-type.component.ts + 24 + + + + Force closed with penalty + + src/app/lightning/channel/closing-type/closing-type.component.ts + 28 + + Open खोल्नु @@ -5554,7 +5829,7 @@ देखाउन कुनै च्यानलहरू छैनन् src/app/lightning/channels-list/channels-list.component.html - 29,35 + 29,37 lightning.empty-channels-list @@ -5563,7 +5838,7 @@ उपनाम src/app/lightning/channels-list/channels-list.component.html - 35,37 + 38,40 src/app/lightning/group/group.component.html @@ -5587,11 +5862,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 10,11 + 11,12 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 10,12 + 11,13 lightning.alias @@ -5600,7 +5875,7 @@ स्थिति src/app/lightning/channels-list/channels-list.component.html - 37,38 + 40,41 status @@ -5609,7 +5884,7 @@ च्यानल आईडी src/app/lightning/channels-list/channels-list.component.html - 41,45 + 44,48 channels.id @@ -5618,11 +5893,11 @@ sats / सैटस src/app/lightning/channels-list/channels-list.component.html - 60,64 + 63,68 src/app/lightning/channels-list/channels-list.component.html - 84,88 + 87,91 src/app/lightning/channels-statistics/channels-statistics.component.html @@ -5666,6 +5941,22 @@ shared.sats + + avg + + src/app/lightning/channels-statistics/channels-statistics.component.html + 3,5 + + statistics.average-small + + + med + + src/app/lightning/channels-statistics/channels-statistics.component.html + 6,9 + + statistics.median-small + Avg Capacity औसत क्षमता @@ -5790,11 +6081,11 @@ src/app/lightning/node-statistics/node-statistics.component.html - 17,18 + 16,17 src/app/lightning/node-statistics/node-statistics.component.html - 54,57 + 53,56 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -5843,10 +6134,6 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 11,12 - - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html 12,13 lightning.liquidity @@ -5863,12 +6150,20 @@ 40,44 - src/app/lightning/node-statistics/node-statistics.component.html - 29,30 + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 src/app/lightning/node-statistics/node-statistics.component.html - 61,64 + 28,29 + + + src/app/lightning/node-statistics/node-statistics.component.html + 60,63 src/app/lightning/nodes-list/nodes-list.component.html @@ -5900,16 +6195,20 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 12,13 + 14,15 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 11,12 + 12,13 src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -5942,7 +6241,7 @@ src/app/lightning/node/node.component.html - 47,49 + 50,52 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5958,11 +6257,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 15,17 + 17,20 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 15,17 + 17,20 lightning.location @@ -6000,9 +6299,17 @@ src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 62 + + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html + 4,9 + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.ts - 29 + 33 + + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 4,9 src/app/lightning/nodes-rankings-dashboard/nodes-rankings-dashboard.component.html @@ -6031,6 +6338,28 @@ lightning.node-fee-distribution + + Outgoing Fees + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 170 + + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 208 + + + + Incoming Fees + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 178 + + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 222 + + Percentage change past week गत हप्ता प्रतिशत परिवर्तन @@ -6040,11 +6369,11 @@ src/app/lightning/node-statistics/node-statistics.component.html - 18,20 + 17,19 src/app/lightning/node-statistics/node-statistics.component.html - 30,32 + 29,31 mining.percentage-change-last-week @@ -6057,11 +6386,11 @@ src/app/lightning/node/node.component.html - 2,4 + 4,6 src/app/lightning/node/node.component.html - 260,262 + 263,265 lightning.node @@ -6074,7 +6403,7 @@ src/app/lightning/node/node.component.html - 27,30 + 30,33 lightning.active-capacity @@ -6087,7 +6416,7 @@ src/app/lightning/node/node.component.html - 34,38 + 37,41 lightning.active-channels @@ -6100,20 +6429,12 @@ country - - No node found for public key "" - - src/app/lightning/node/node.component.html - 17,19 - - lightning.node-not-found - Average channel size सरदर च्यानल साइज src/app/lightning/node/node.component.html - 40,43 + 43,46 lightning.active-channels-avg @@ -6121,7 +6442,7 @@ Avg channel distance src/app/lightning/node/node.component.html - 56,57 + 59,60 lightning.avg-distance @@ -6130,7 +6451,7 @@ रङ src/app/lightning/node/node.component.html - 79,81 + 82,84 lightning.color @@ -6138,7 +6459,7 @@ ISP src/app/lightning/node/node.component.html - 86,87 + 89,90 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html @@ -6150,7 +6471,7 @@ Exclusively on Tor src/app/lightning/node/node.component.html - 93,95 + 96,98 tor @@ -6158,7 +6479,7 @@ Liquidity ad src/app/lightning/node/node.component.html - 138,141 + 141,144 node.liquidity-ad @@ -6166,7 +6487,7 @@ Lease fee rate src/app/lightning/node/node.component.html - 144,147 + 147,150 Liquidity ad lease fee rate liquidity-ad.lease-fee-rate @@ -6175,7 +6496,7 @@ Lease base fee src/app/lightning/node/node.component.html - 152,154 + 155,157 liquidity-ad.lease-base-fee @@ -6183,7 +6504,7 @@ Funding weight src/app/lightning/node/node.component.html - 158,159 + 161,162 liquidity-ad.funding-weight @@ -6191,7 +6512,7 @@ Channel fee rate src/app/lightning/node/node.component.html - 168,171 + 171,174 Liquidity ad channel fee rate liquidity-ad.channel-fee-rate @@ -6200,7 +6521,7 @@ Channel base fee src/app/lightning/node/node.component.html - 176,178 + 179,181 liquidity-ad.channel-base-fee @@ -6208,7 +6529,7 @@ Compact lease src/app/lightning/node/node.component.html - 188,190 + 191,193 liquidity-ad.compact-lease @@ -6216,7 +6537,7 @@ TLV extension records src/app/lightning/node/node.component.html - 199,202 + 202,205 node.tlv.records @@ -6225,7 +6546,7 @@ खुल्ला च्यानलहरू src/app/lightning/node/node.component.html - 240,243 + 243,246 lightning.open-channels @@ -6234,7 +6555,7 @@ बन्द च्यानलहरू src/app/lightning/node/node.component.html - 244,247 + 247,250 lightning.open-channels @@ -6278,7 +6599,7 @@ कुनै जियोलोकेशन डाटा उपलब्ध छैन src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts - 218,213 + 219,214 @@ -6300,8 +6621,8 @@ 112,107 - - Reachable on Clearnet Only + + Clearnet and Darknet src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -6311,8 +6632,8 @@ 303,302 - - Reachable on Clearnet and Darknet + + Clearnet Only (IPv4, IPv6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -6322,8 +6643,8 @@ 295,294 - - Reachable on Darknet Only + + Darknet Only (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -6347,19 +6668,22 @@ lightning.share - nodes - नोडहरू + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6367,7 +6691,7 @@ BTC क्षमता src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6482,11 +6806,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 @@ -6575,24 +6899,6 @@ 27 - - Top 100 nodes liquidity ranking - शीर्ष 100 नोड्स तरलता रैंकिंग - - src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 3,7 - - lightning.top-100-liquidity - - - Top 100 nodes connectivity ranking - शीर्ष 100 नोड कनेक्टिविटी रैंकिंग - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 3,7 - - lightning.top-100-connectivity - Oldest nodes सबैभन्दा पुरानो नोड्स diff --git a/frontend/src/locale/messages.nl.xlf b/frontend/src/locale/messages.nl.xlf index c1d10e51c..999a63145 100644 --- a/frontend/src/locale/messages.nl.xlf +++ b/frontend/src/locale/messages.nl.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1074,7 +1074,7 @@ src/app/components/transaction/transaction.component.html - 282,284 + 283,285 transaction.version @@ -1202,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 256,261 + 257,262 src/app/components/transaction/transaction.component.html - 400,406 + 401,407 transaction.details @@ -1223,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 243,247 + 244,248 src/app/components/transaction/transaction.component.html - 371,377 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1245,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 244,243 + 246,245 @@ -1487,7 +1487,7 @@ Community-allianties src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Projectvertalers src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Projectbijdragers src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Projectleden src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Projectonderhouders src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -1581,7 +1581,7 @@ src/app/components/amount/amount.component.html - 20,23 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -2044,7 +2044,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2093,7 +2093,7 @@ src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2114,7 +2114,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2155,7 +2155,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2181,7 +2181,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/transactions-list/transactions-list.component.html @@ -2203,7 +2203,7 @@ src/app/components/transaction/transaction.component.html - 475,477 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2297,11 +2297,11 @@ src/app/components/transaction/transaction.component.html - 477,480 + 478,481 src/app/components/transaction/transaction.component.html - 488,490 + 489,491 src/app/components/transactions-list/transactions-list.component.html @@ -2331,7 +2331,7 @@ src/app/components/transaction/transaction.component.html - 268,271 + 269,272 Transaction Virtual Size transaction.vsize @@ -2407,7 +2407,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2448,7 +2448,7 @@ src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2465,7 +2465,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2506,7 +2506,7 @@ src/app/components/transaction/transaction.component.html - 264,266 + 265,267 src/app/dashboard/dashboard.component.html @@ -2534,7 +2534,7 @@ src/app/components/transaction/transaction.component.html - 272,274 + 273,275 @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2846,11 +2850,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2891,7 +2895,7 @@ src/app/components/transaction/transaction.component.html - 248,253 + 249,254 src/app/lightning/channel/channel.component.html @@ -3080,13 +3084,17 @@ Difficulty Adjustment Moeilijkheidsaanpassing + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3094,11 +3102,11 @@ Remaining Resterend - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3115,11 @@ blocks blokken - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3132,11 +3140,11 @@ block blok - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3149,11 +3157,11 @@ Estimate Schatting - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3162,20 +3170,24 @@ Previous Vorige - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Huidige Periode - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3184,11 +3196,99 @@ Next Halving Volgende Halvering - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) Of 2x het minimum, of het lage prioriteitstarief (welke van beide lager is) @@ -3346,7 +3446,7 @@ Mining src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3355,7 +3455,7 @@ Poolrankering src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3368,7 +3468,7 @@ Pooldominatie src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3381,7 +3481,7 @@ Hashrate & Moeilijkheid src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3390,7 +3490,7 @@ Lightning src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3399,7 +3499,7 @@ Lightning Nodes Per Netwerk src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3420,7 +3520,7 @@ Lightning Netwerk Capaciteit src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3441,7 +3541,7 @@ Lightning Nodes Per ISP src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3454,7 +3554,7 @@ Lightning Nodes Per Land src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3471,7 +3571,7 @@ Lightningnodes Wereldkaart src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3488,7 +3588,7 @@ Lightningnodekanalen Wereldkaart src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3509,11 +3609,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3543,11 +3643,11 @@ Hashrate (MG) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3667,7 +3767,7 @@ Beloningstatistieken src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3676,7 +3776,7 @@ (144 blokken) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3685,7 +3785,7 @@ Laatste blokken src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3698,7 +3798,7 @@ Aanpassingen src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3707,7 +3807,7 @@ Transactie Uitzenden src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3882,9 +3982,8 @@ 58 - - blocks - blokken + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3893,6 +3992,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4115,7 +4249,7 @@ src/app/components/transaction/transaction.component.html - 290,291 + 291,292 transaction.hex @@ -4339,7 +4473,7 @@ Filter src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4348,7 +4482,7 @@ Omkeren src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4357,7 +4491,7 @@ Transactie-vBytes per seconde (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4365,196 +4499,188 @@ Just now Zojuist - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago geleden - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + Over ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After Na - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - In ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4688,7 +4814,7 @@ src/app/components/transaction/transaction.component.html - 340,344 + 341,345 Transaction flow transaction.flow @@ -4707,7 +4833,7 @@ Toon meer src/app/components/transaction/transaction.component.html - 225,227 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4724,7 +4850,7 @@ Toon minder src/app/components/transaction/transaction.component.html - 227,233 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4737,7 +4863,7 @@ Toon diagram src/app/components/transaction/transaction.component.html - 247,248 + 248,249 show-diagram @@ -4746,7 +4872,7 @@ Locktime src/app/components/transaction/transaction.component.html - 286,288 + 287,289 transaction.locktime @@ -4755,7 +4881,7 @@ Transactie niet gevonden. src/app/components/transaction/transaction.component.html - 449,450 + 450,451 transaction.error.transaction-not-found @@ -4764,7 +4890,7 @@ Wachten tot het in de mempool verschijnt... src/app/components/transaction/transaction.component.html - 450,455 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4773,7 +4899,7 @@ Effectief vergoedingstarief src/app/components/transaction/transaction.component.html - 485,488 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -5228,6 +5354,10 @@ src/app/docs/api-docs/api-docs.component.html 13 + + src/app/docs/api-docs/api-docs.component.html + 14 + faq.big-disclaimer @@ -5235,7 +5365,7 @@ REST API service src/app/docs/api-docs/api-docs.component.html - 41,42 + 42,43 api-docs.title @@ -5244,11 +5374,11 @@ Eindpunt src/app/docs/api-docs/api-docs.component.html - 50,51 + 51,52 src/app/docs/api-docs/api-docs.component.html - 104,107 + 105,108 Api docs endpoint @@ -5257,11 +5387,11 @@ Omschrijving src/app/docs/api-docs/api-docs.component.html - 69,70 + 70,71 src/app/docs/api-docs/api-docs.component.html - 108,109 + 109,110 @@ -5269,7 +5399,7 @@ Default push: actie: 'want', data: ['blocks', ...] om uit te drukken wat je gepushed wilt hebben. Beschikbaar: blocks, mempool-blocks, live-2h-chart, en stats.Pushtransacties gerelateerd aan adres: 'track-address': '3PbJ...bF9B' om alle nieuwe transacties met dat adres als invoer of uitvoer te ontvangen. Retourneert een reeks transacties. address-transactions voor nieuwe mempooltransacties, en block-transactions voor nieuwe blokbevestigde transacties. src/app/docs/api-docs/api-docs.component.html - 109,110 + 110,111 api-docs.websocket.websocket @@ -5444,6 +5574,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5558,6 +5692,14 @@ src/app/lightning/channels-list/channels-list.component.html 43,46 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 + src/app/lightning/node-statistics/node-statistics.component.html 4,5 @@ -5676,7 +5818,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5817,7 +5959,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6079,6 +6221,14 @@ src/app/lightning/group/group.component.html 40,44 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 + src/app/lightning/node-statistics/node-statistics.component.html 28,29 @@ -6127,6 +6277,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6604,19 +6758,22 @@ lightning.share - nodes - nodes + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6624,7 +6781,7 @@ BTC-capaciteit src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6742,11 +6899,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.pl.xlf b/frontend/src/locale/messages.pl.xlf index 7970bfe8b..5e0e5ad44 100644 --- a/frontend/src/locale/messages.pl.xlf +++ b/frontend/src/locale/messages.pl.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1487,7 +1487,7 @@ Sojusze społecznościowe src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Tłumacze projektu src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Współtwórcy projektu src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Członkowie projektu src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Opiekunowie projektu src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -3094,7 +3094,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3778,7 +3778,7 @@ Statystyki nagród src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3787,7 +3787,7 @@ (144 bloków) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3796,7 +3796,7 @@ Ostatnie bloki src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3809,7 +3809,7 @@ Dostosowania src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3818,7 +3818,7 @@ Rozgłoś transakcję src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3993,9 +3993,9 @@ 58 - - blocks - bloków + + blocks + bloków src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -4004,6 +4004,42 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + Inne () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -5551,6 +5587,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5791,7 +5831,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5932,7 +5972,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6250,6 +6290,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6730,19 +6774,23 @@ lightning.share - nodes - węzłów + nodes + węzłów src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6750,7 +6798,7 @@ pojemność BTC src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6868,11 +6916,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.pt.xlf b/frontend/src/locale/messages.pt.xlf index 1d7764f84..e6ef0f346 100644 --- a/frontend/src/locale/messages.pt.xlf +++ b/frontend/src/locale/messages.pt.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1487,7 +1487,7 @@ Alianças da comunidade src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Tradutores do Projeto src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Contribuidores do projeto src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Membros do Projeto src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Mantenedores do projeto src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -3094,7 +3094,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3778,7 +3778,7 @@ Estatisticas de recompensas src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3787,7 +3787,7 @@ (144 blocos) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3796,7 +3796,7 @@ Últimos blocos src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3809,7 +3809,7 @@ Ajustes src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3818,7 +3818,7 @@ Transmitir Transação src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3993,9 +3993,8 @@ 58 - - blocks - blocos + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -4004,6 +4003,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -5551,6 +5585,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5791,7 +5829,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5932,7 +5970,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6250,6 +6288,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6730,19 +6772,22 @@ lightning.share - nodes - nós + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6750,7 +6795,7 @@ Capacidade de BTC src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6868,11 +6913,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.ro.xlf b/frontend/src/locale/messages.ro.xlf index 18051fdbe..2dfca47ad 100644 --- a/frontend/src/locale/messages.ro.xlf +++ b/frontend/src/locale/messages.ro.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1074,7 +1074,7 @@ src/app/components/transaction/transaction.component.html - 282,284 + 283,285 transaction.version @@ -1202,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 256,261 + 257,262 src/app/components/transaction/transaction.component.html - 400,406 + 401,407 transaction.details @@ -1223,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 243,247 + 244,248 src/app/components/transaction/transaction.component.html - 371,377 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1245,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 244,243 + 246,245 @@ -1487,7 +1487,7 @@ Alianțe din Comunitate src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Traducători ai proiectului src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Contribuitori ai proiectului src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Membrii Proiectului src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Întreținători ai proiectului src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -1581,7 +1581,7 @@ src/app/components/amount/amount.component.html - 20,23 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -2044,7 +2044,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2093,7 +2093,7 @@ src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2114,7 +2114,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2155,7 +2155,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2181,7 +2181,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/transactions-list/transactions-list.component.html @@ -2203,7 +2203,7 @@ src/app/components/transaction/transaction.component.html - 475,477 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2297,11 +2297,11 @@ src/app/components/transaction/transaction.component.html - 477,480 + 478,481 src/app/components/transaction/transaction.component.html - 488,490 + 489,491 src/app/components/transactions-list/transactions-list.component.html @@ -2331,7 +2331,7 @@ src/app/components/transaction/transaction.component.html - 268,271 + 269,272 Transaction Virtual Size transaction.vsize @@ -2407,7 +2407,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2448,7 +2448,7 @@ src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2465,7 +2465,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2506,7 +2506,7 @@ src/app/components/transaction/transaction.component.html - 264,266 + 265,267 src/app/dashboard/dashboard.component.html @@ -2534,7 +2534,7 @@ src/app/components/transaction/transaction.component.html - 272,274 + 273,275 @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2846,11 +2850,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2891,7 +2895,7 @@ src/app/components/transaction/transaction.component.html - 248,253 + 249,254 src/app/lightning/channel/channel.component.html @@ -3080,13 +3084,17 @@ Difficulty Adjustment Ajustarea Dificultății + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3094,11 +3102,11 @@ Remaining Rămas - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3115,11 @@ blocks blocuri - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3132,11 +3140,11 @@ block bloc - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3149,11 +3157,11 @@ Estimate Estimare - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3162,20 +3170,24 @@ Previous Anterior - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Perioada Curentă - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3184,11 +3196,99 @@ Next Halving Înjumătățirea următoare - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) 2x minimum sau valoarea Prioritate Scăzută (oricare este mai mică) @@ -3346,7 +3446,7 @@ Minerit src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3355,7 +3455,7 @@ Clasament Fonduri src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3368,7 +3468,7 @@ Dominanță Fonduri src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3381,7 +3481,7 @@ Rată hash & Dificultate src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3390,7 +3490,7 @@ Lightning src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3399,7 +3499,7 @@ Noduri Lightning Per Rețea src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3420,7 +3520,7 @@ Capacitatea rețelei Lightning src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3441,7 +3541,7 @@ Noduri Lightning Per ISP src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3454,7 +3554,7 @@ Noduri Lightning per țară src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3471,7 +3571,7 @@ Harta lumii cu Noduri Lightning src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3488,7 +3588,7 @@ Harta lumii cu canale ale nodurilor Lightning src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3509,11 +3609,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3543,11 +3643,11 @@ Rată hash (MA) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3667,7 +3767,7 @@ Statistici Recompense src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3676,7 +3776,7 @@ (144 blocuri) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3685,7 +3785,7 @@ Ultimele blocuri src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3698,7 +3798,7 @@ Ajustări src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3707,7 +3807,7 @@ Transmite Tranzacție src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3882,9 +3982,8 @@ 58 - - blocks - blocuri + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3893,6 +3992,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4115,7 +4249,7 @@ src/app/components/transaction/transaction.component.html - 290,291 + 291,292 transaction.hex @@ -4339,7 +4473,7 @@ Filtru src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4348,7 +4482,7 @@ Inversează src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4357,7 +4491,7 @@ Tranzacție vBytes pe secundă (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4365,196 +4499,188 @@ Just now Chiar acum - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago Acum - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + În ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After După - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - În ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4688,7 +4814,7 @@ src/app/components/transaction/transaction.component.html - 340,344 + 341,345 Transaction flow transaction.flow @@ -4707,7 +4833,7 @@ Arată mai multe src/app/components/transaction/transaction.component.html - 225,227 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4724,7 +4850,7 @@ Arată mai puțin src/app/components/transaction/transaction.component.html - 227,233 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4737,7 +4863,7 @@ Arată diagrama src/app/components/transaction/transaction.component.html - 247,248 + 248,249 show-diagram @@ -4746,7 +4872,7 @@ Locktime src/app/components/transaction/transaction.component.html - 286,288 + 287,289 transaction.locktime @@ -4755,7 +4881,7 @@ Tranzacția nu a fost găsită. src/app/components/transaction/transaction.component.html - 449,450 + 450,451 transaction.error.transaction-not-found @@ -4764,7 +4890,7 @@ Se așteaptă să apară în mempool... src/app/components/transaction/transaction.component.html - 450,455 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4773,7 +4899,7 @@ Rata efectivă a comisionului src/app/components/transaction/transaction.component.html - 485,488 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -5228,6 +5354,10 @@ src/app/docs/api-docs/api-docs.component.html 13 + + src/app/docs/api-docs/api-docs.component.html + 14 + faq.big-disclaimer @@ -5235,7 +5365,7 @@ Serviciu REST API src/app/docs/api-docs/api-docs.component.html - 41,42 + 42,43 api-docs.title @@ -5244,11 +5374,11 @@ Terminație src/app/docs/api-docs/api-docs.component.html - 50,51 + 51,52 src/app/docs/api-docs/api-docs.component.html - 104,107 + 105,108 Api docs endpoint @@ -5257,11 +5387,11 @@ Descriere src/app/docs/api-docs/api-docs.component.html - 69,70 + 70,71 src/app/docs/api-docs/api-docs.component.html - 108,109 + 109,110 @@ -5269,7 +5399,7 @@ Trimitere implicită: acțiune: 'want', data: ['blocks', ...] pentru a exprima ce dorești să trimiți. Disponibil: blocks, mempool-blocks, live-2h-chart, și stats.Tranzacții de trimitere pentru adresa: 'track-address': '3PbJ...bF9B' pentru a primi toate tranzacțiile noi care conțin acea adresă ca intrare sau iesire. Returnează un șir de tranzacții. address-transactions pentru tranzacții noi din mempool, și block-transactions pentru tranzacții confirmate din blocuri noi. src/app/docs/api-docs/api-docs.component.html - 109,110 + 110,111 api-docs.websocket.websocket @@ -5444,6 +5574,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5558,6 +5692,14 @@ src/app/lightning/channels-list/channels-list.component.html 43,46 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 + src/app/lightning/node-statistics/node-statistics.component.html 4,5 @@ -5676,7 +5818,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5817,7 +5959,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6079,6 +6221,14 @@ src/app/lightning/group/group.component.html 40,44 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 + src/app/lightning/node-statistics/node-statistics.component.html 28,29 @@ -6127,6 +6277,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6604,19 +6758,22 @@ lightning.share - nodes - noduri + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6624,7 +6781,7 @@ capacitate BTC src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6742,11 +6899,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.ru.xlf b/frontend/src/locale/messages.ru.xlf index d9b9221b7..ef455e2a5 100644 --- a/frontend/src/locale/messages.ru.xlf +++ b/frontend/src/locale/messages.ru.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1074,7 +1074,7 @@ src/app/components/transaction/transaction.component.html - 282,284 + 283,285 transaction.version @@ -1202,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 256,261 + 257,262 src/app/components/transaction/transaction.component.html - 400,406 + 401,407 transaction.details @@ -1223,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 243,247 + 244,248 src/app/components/transaction/transaction.component.html - 371,377 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1245,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 244,243 + 246,245 @@ -1487,7 +1487,7 @@ Обьединения Сообщества src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Переводы src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Участники проекта src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Участники проекта src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Разработчики проекта src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -1581,7 +1581,7 @@ src/app/components/amount/amount.component.html - 20,23 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -2044,7 +2044,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2093,7 +2093,7 @@ src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2114,7 +2114,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2155,7 +2155,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2181,7 +2181,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/transactions-list/transactions-list.component.html @@ -2203,7 +2203,7 @@ src/app/components/transaction/transaction.component.html - 475,477 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2297,11 +2297,11 @@ src/app/components/transaction/transaction.component.html - 477,480 + 478,481 src/app/components/transaction/transaction.component.html - 488,490 + 489,491 src/app/components/transactions-list/transactions-list.component.html @@ -2331,7 +2331,7 @@ src/app/components/transaction/transaction.component.html - 268,271 + 269,272 Transaction Virtual Size transaction.vsize @@ -2407,7 +2407,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2448,7 +2448,7 @@ src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2465,7 +2465,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2506,7 +2506,7 @@ src/app/components/transaction/transaction.component.html - 264,266 + 265,267 src/app/dashboard/dashboard.component.html @@ -2534,7 +2534,7 @@ src/app/components/transaction/transaction.component.html - 272,274 + 273,275 @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2846,11 +2850,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2891,7 +2895,7 @@ src/app/components/transaction/transaction.component.html - 248,253 + 249,254 src/app/lightning/channel/channel.component.html @@ -3080,13 +3084,17 @@ Difficulty Adjustment Корректировка сложности + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3094,11 +3102,11 @@ Remaining Осталось - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3115,11 @@ blocks блоков - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3132,11 +3140,11 @@ block блоков - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3149,11 +3157,11 @@ Estimate Приблизительно - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3162,20 +3170,24 @@ Previous Предыдущий - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Текущий период - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3184,11 +3196,99 @@ Next Halving Следующий халвинг - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) Введите как минимум ×2 или ставку низкого приоритета (меньшее из двух) @@ -3346,7 +3446,7 @@ Майнинг src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3355,7 +3455,7 @@ Рейтинг пулов src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3368,7 +3468,7 @@ Доминация пулов src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3381,7 +3481,7 @@ Хэшрейт и сложность src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3390,7 +3490,7 @@ Лайтнинг src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3399,7 +3499,7 @@ Узлы Лайтнинг на сеть src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3420,7 +3520,7 @@ Объем сети Лайтнинг src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3441,7 +3541,7 @@ Узлов Лайтнинг на провайдера src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3454,7 +3554,7 @@ Узлов Лайтнинг на страну src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3471,7 +3571,7 @@ Мировая карта узлов Лайтнинг src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3488,7 +3588,7 @@ Мировая карта лайтнинг-каналов src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3509,11 +3609,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3543,11 +3643,11 @@ Хэшрейт (ср.) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3667,7 +3767,7 @@ Статистика вознаграждений src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3676,7 +3776,7 @@ (144 блока) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3685,7 +3785,7 @@ Последние блоки src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3698,7 +3798,7 @@ Корректировки src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3707,7 +3807,7 @@ Транслировать транзакцию src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3882,9 +3982,8 @@ 58 - - blocks - блоки + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3893,6 +3992,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4115,7 +4249,7 @@ src/app/components/transaction/transaction.component.html - 290,291 + 291,292 transaction.hex @@ -4339,7 +4473,7 @@ Фильтр src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4348,7 +4482,7 @@ Инвертировать src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4357,7 +4491,7 @@ Транзакционные vBytes в секунду (vB / s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4365,196 +4499,187 @@ Just now Только что - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago назад - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After После - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - Через ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4688,7 +4813,7 @@ src/app/components/transaction/transaction.component.html - 340,344 + 341,345 Transaction flow transaction.flow @@ -4707,7 +4832,7 @@ Показать больше src/app/components/transaction/transaction.component.html - 225,227 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4724,7 +4849,7 @@ Показывай меньше src/app/components/transaction/transaction.component.html - 227,233 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4737,7 +4862,7 @@ Показать схему src/app/components/transaction/transaction.component.html - 247,248 + 248,249 show-diagram @@ -4746,7 +4871,7 @@ Время блокировки src/app/components/transaction/transaction.component.html - 286,288 + 287,289 transaction.locktime @@ -4755,7 +4880,7 @@ Транзакция не найдена. src/app/components/transaction/transaction.component.html - 449,450 + 450,451 transaction.error.transaction-not-found @@ -4764,7 +4889,7 @@ Ожидаем ее появления в мемпуле ... src/app/components/transaction/transaction.component.html - 450,455 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4773,7 +4898,7 @@ Эффективная комиссионная ставка src/app/components/transaction/transaction.component.html - 485,488 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -5228,6 +5353,10 @@ src/app/docs/api-docs/api-docs.component.html 13 + + src/app/docs/api-docs/api-docs.component.html + 14 + faq.big-disclaimer @@ -5235,7 +5364,7 @@ Служба REST API src/app/docs/api-docs/api-docs.component.html - 41,42 + 42,43 api-docs.title @@ -5244,11 +5373,11 @@ Конечная точка src/app/docs/api-docs/api-docs.component.html - 50,51 + 51,52 src/app/docs/api-docs/api-docs.component.html - 104,107 + 105,108 Api docs endpoint @@ -5257,11 +5386,11 @@ Описание src/app/docs/api-docs/api-docs.component.html - 69,70 + 70,71 src/app/docs/api-docs/api-docs.component.html - 108,109 + 109,110 @@ -5269,7 +5398,7 @@ Пуш по умолчанию: действие: 'want', data: ['blocks', ...] , чтобы выразить то, что вы хотите запушить. Доступно: блоки , mempool-blocks , live-2h-chart иstats Пуш-транзакций, связанных с адресом: 'track-address': '3PbJ ... bF9B' для получения всех новых транзакционных входных или выходных данных, относящихся к данному адресу. Предоставляет массив транзакций. транзакций данного адреса, для новых транзакций мемпула и транзакций блока для транзакций, подтвержденных в новом блоке. src/app/docs/api-docs/api-docs.component.html - 109,110 + 110,111 api-docs.websocket.websocket @@ -5444,6 +5573,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5558,6 +5691,14 @@ src/app/lightning/channels-list/channels-list.component.html 43,46 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 + src/app/lightning/node-statistics/node-statistics.component.html 4,5 @@ -5676,7 +5817,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5817,7 +5958,7 @@ сат src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6079,6 +6220,14 @@ src/app/lightning/group/group.component.html 40,44 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 + src/app/lightning/node-statistics/node-statistics.component.html 28,29 @@ -6127,6 +6276,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6604,19 +6757,22 @@ lightning.share - nodes - узлы + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6624,7 +6780,7 @@ Емкость BTC src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6742,11 +6898,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.sl.xlf b/frontend/src/locale/messages.sl.xlf index 6c5bfc3bb..0ab3be00c 100644 --- a/frontend/src/locale/messages.sl.xlf +++ b/frontend/src/locale/messages.sl.xlf @@ -357,11 +357,11 @@ src/app/components/block/block.component.html - 290,291 + 310,311 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 26,27 + 46,47 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -382,11 +382,11 @@ src/app/components/block/block.component.html - 291,292 + 311,312 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 27,28 + 47,48 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -424,7 +424,7 @@ src/app/components/block/block.component.html - 40,41 + 38,39 block.hash @@ -449,7 +449,7 @@ src/app/components/block/block.component.html - 44,46 + 42,44 src/app/components/blocks-list/blocks-list.component.html @@ -592,11 +592,11 @@ src/app/components/master-page/master-page.component.html - 49,51 + 48,50 src/app/components/pool-ranking/pool-ranking.component.html - 94,96 + 94,95 @@ -748,11 +748,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -773,16 +773,24 @@ src/app/components/about/about.component.html - 385,389 + 391,394 + + + src/app/components/mining-dashboard/mining-dashboard.component.html + 87 src/app/dashboard/dashboard.component.html - 150,152 + 157,159 src/app/docs/docs/docs.component.html 51 + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 97 + Terms of Service shared.terms-of-service @@ -793,14 +801,22 @@ src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html 113,120 + + src/app/components/mining-dashboard/mining-dashboard.component.html + 89 + src/app/dashboard/dashboard.component.html - 152,154 + 159,161 src/app/docs/docs/docs.component.html 53 + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 99 + Privacy Policy shared.privacy-policy @@ -988,7 +1004,7 @@ src/app/dashboard/dashboard.component.html - 124,125 + 124,126 @@ -1036,7 +1052,7 @@ src/app/components/transaction/transaction.component.html - 158,160 + 152,154 src/app/components/transactions-list/transactions-list.component.html @@ -1052,11 +1068,11 @@ src/app/components/block/block.component.html - 246,247 + 252,253 src/app/components/transaction/transaction.component.html - 288,290 + 283,285 transaction.version @@ -1106,7 +1122,7 @@ src/app/components/transactions-list/transactions-list.component.html - 294,295 + 296,297 Transaction singular confirmation count shared.confirmation-count.singular @@ -1128,7 +1144,7 @@ src/app/components/transactions-list/transactions-list.component.html - 295,296 + 297,298 Transaction plural confirmation count shared.confirmation-count.plural @@ -1140,10 +1156,6 @@ src/app/bisq/bisq-transaction/bisq-transaction.component.html 43,45 - - src/app/components/transaction/transaction.component.html - 65,67 - Transaction included in block transaction.included-in-block @@ -1156,11 +1168,11 @@ src/app/components/transaction/transaction.component.html - 77,80 + 71,74 src/app/components/transaction/transaction.component.html - 135,138 + 129,132 Transaction features transaction.features @@ -1188,11 +1200,11 @@ src/app/components/transaction/transaction.component.html - 262,267 + 257,262 src/app/components/transaction/transaction.component.html - 406,412 + 401,407 transaction.details @@ -1209,11 +1221,11 @@ src/app/components/transaction/transaction.component.html - 249,253 + 244,248 src/app/components/transaction/transaction.component.html - 377,383 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1231,7 +1243,7 @@ src/app/components/transaction/transaction.component.ts - 241,240 + 246,245 @@ -1251,7 +1263,7 @@ src/app/components/transaction/transaction.component.html - 159,160 + 153,154 src/app/dashboard/dashboard.component.html @@ -1267,7 +1279,7 @@ src/app/components/transaction/transaction.component.html - 72,73 + 66,67 Transaction Confirmed state transaction.confirmed @@ -1438,7 +1450,7 @@ Raziskovalec blokov in mempool-a razvit za Bitcoin skupnost, osredotočen na trg omrežnin za transakcije in večplastni ekosistem. Samogostovanje brez zaupanja vrednih tretjih oseb. src/app/components/about/about.component.html - 13,17 + 13,16 @@ -1446,7 +1458,7 @@ Sponzorji - podjetja 🚀 src/app/components/about/about.component.html - 29,32 + 19,22 about.sponsors.enterprise.withRocket @@ -1455,7 +1467,7 @@ Sponzorji - posamezniki ❤️ src/app/components/about/about.component.html - 177,180 + 167,170 about.sponsors.withHeart @@ -1463,7 +1475,7 @@ Community Integrations src/app/components/about/about.component.html - 191,193 + 181,183 about.community-integrations @@ -1472,7 +1484,7 @@ Zavezništva skupnosti src/app/components/about/about.component.html - 285,287 + 291,293 about.alliances @@ -1481,7 +1493,7 @@ Prevajalci src/app/components/about/about.component.html - 301,303 + 307,309 about.translators @@ -1490,7 +1502,7 @@ Sodelujoči src/app/components/about/about.component.html - 315,317 + 321,323 about.contributors @@ -1499,7 +1511,7 @@ Člani projekta src/app/components/about/about.component.html - 327,329 + 333,335 about.project_members @@ -1508,7 +1520,7 @@ Vzdrževalci src/app/components/about/about.component.html - 340,342 + 346,348 about.maintainers @@ -1517,7 +1529,7 @@ O projektu src/app/components/about/about.component.ts - 39 + 42 src/app/components/bisq-master-page/bisq-master-page.component.html @@ -1529,7 +1541,7 @@ src/app/components/master-page/master-page.component.html - 58,61 + 57,60 @@ -1565,7 +1577,7 @@ src/app/components/amount/amount.component.html - 6,9 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -1581,7 +1593,7 @@ src/app/components/transactions-list/transactions-list.component.html - 302,304 + 304,306 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -1664,7 +1676,7 @@ src/app/components/assets/assets.component.html - 29,31 + 31,33 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -1886,7 +1898,7 @@ src/app/components/assets/assets.component.html - 30,31 + 32,33 Asset ticker header @@ -1899,7 +1911,7 @@ src/app/components/assets/assets.component.html - 31,34 + 33,36 Asset Issuer Domain header @@ -1912,7 +1924,7 @@ src/app/components/assets/assets.component.html - 32,36 + 34,38 Asset ID header @@ -1921,7 +1933,7 @@ Napaka pri nalaganju podatkov o sredstvih. src/app/components/assets/assets.component.html - 48,53 + 50,55 Asset data load error @@ -2028,7 +2040,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2045,7 +2057,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 161 + 165 @@ -2061,7 +2073,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 163 + 167 @@ -2073,11 +2085,11 @@ src/app/components/block-fees-graph/block-fees-graph.component.ts - 62 + 67 src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2086,19 +2098,19 @@ Indeksiranje blokov src/app/components/block-fees-graph/block-fees-graph.component.ts - 110,105 + 116,111 src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 108,103 + 113,108 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 115,110 + 116,111 src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2138,7 +2150,7 @@ src/app/components/transaction/transaction.component.html - 476 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2164,11 +2176,11 @@ src/app/components/transaction/transaction.component.html - 476,477 + 473 src/app/components/transactions-list/transactions-list.component.html - 286,287 + 288 sat shared.sat @@ -2182,11 +2194,11 @@ src/app/components/transaction/transaction.component.html - 161,165 + 155,159 src/app/components/transaction/transaction.component.html - 479,481 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2198,7 +2210,7 @@ src/app/lightning/channels-list/channels-list.component.html - 38,39 + 41,43 Transaction fee rate transaction.fee-rate @@ -2216,19 +2228,19 @@ src/app/components/block/block.component.html - 125,128 + 124,127 src/app/components/block/block.component.html - 129 + 128,130 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 12,14 + 19,22 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 15,17 + 30,33 src/app/components/fees-box/fees-box.component.html @@ -2268,27 +2280,27 @@ src/app/components/transaction/transaction.component.html - 173,174 + 167,168 src/app/components/transaction/transaction.component.html - 184,185 + 178,179 src/app/components/transaction/transaction.component.html - 195,196 + 189,190 src/app/components/transaction/transaction.component.html - 481,484 + 478,481 src/app/components/transaction/transaction.component.html - 492,494 + 489,491 src/app/components/transactions-list/transactions-list.component.html - 286 + 286,287 src/app/dashboard/dashboard.component.html @@ -2296,7 +2308,7 @@ src/app/dashboard/dashboard.component.html - 204,208 + 213,217 sat/vB shared.sat-vbyte @@ -2310,11 +2322,11 @@ src/app/components/transaction/transaction.component.html - 160,162 + 154,156 src/app/components/transaction/transaction.component.html - 274,277 + 269,272 Transaction Virtual Size transaction.vsize @@ -2384,7 +2396,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2420,11 +2432,11 @@ src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 60 + 65 src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2441,7 +2453,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2450,15 +2462,15 @@ Velikost src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 180,179 + 184,183 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 226,224 + 239,237 src/app/components/block/block.component.html - 50,52 + 48,50 src/app/components/blocks-list/blocks-list.component.html @@ -2482,7 +2494,7 @@ src/app/components/transaction/transaction.component.html - 270,272 + 265,267 src/app/dashboard/dashboard.component.html @@ -2494,11 +2506,11 @@ Utež src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 188,187 + 192,191 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 257,254 + 270,267 src/app/components/block/block-preview.component.html @@ -2506,11 +2518,22 @@ src/app/components/block/block.component.html - 54,56 + 52,54 src/app/components/transaction/transaction.component.html - 278,280 + 273,275 + + + + Size per weight + + src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts + 200,199 + + + src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts + 282,279 @@ -2525,14 +2548,6 @@ shared.block-title - - - - src/app/components/block/block-preview.component.html - 11,12 - - shared.block-title - Median fee Mediana omrežnin @@ -2542,7 +2557,7 @@ src/app/components/block/block.component.html - 128,129 + 127,128 src/app/components/mempool-block/mempool-block.component.html @@ -2559,11 +2574,11 @@ src/app/components/block/block.component.html - 133,135 + 138,140 src/app/components/block/block.component.html - 159,162 + 164,167 src/app/components/mempool-block/mempool-block.component.html @@ -2581,7 +2596,7 @@ src/app/components/block/block.component.html - 168,170 + 173,175 block.miner @@ -2594,7 +2609,7 @@ src/app/components/block/block.component.ts - 227 + 242 @@ -2604,6 +2619,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2619,31 +2638,47 @@ Previous Block - - Block health + + Health src/app/components/block/block.component.html - 58,61 + 56 - block.health + + src/app/components/blocks-list/blocks-list.component.html + 18,19 + + + src/app/components/blocks-list/blocks-list.component.html + 18,19 + + latest-blocks.health Unknown src/app/components/block/block.component.html - 69,72 + 67,70 src/app/components/blocks-list/blocks-list.component.html 60,63 - src/app/lightning/node/node.component.html - 52,55 + src/app/components/pool-ranking/pool-ranking.component.html + 121,124 + + + src/app/lightning/channel/closing-type/closing-type.component.ts + 32 src/app/lightning/node/node.component.html - 96,100 + 55,58 + + + src/app/lightning/node/node.component.html + 99,103 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts @@ -2660,7 +2695,7 @@ Razpon omrežnin src/app/components/block/block.component.html - 124,125 + 123,124 src/app/components/mempool-block/mempool-block.component.html @@ -2673,7 +2708,7 @@ Na podlagi povprečne native segwit transakcije (140 vBajtov). src/app/components/block/block.component.html - 129,131 + 131,136 src/app/components/fees-box/fees-box.component.html @@ -2697,49 +2732,60 @@ Transaction fee tooltip - - Subsidy + fees: - Novi kovanci + omrežnine: + + Subsidy + fees src/app/components/block/block.component.html - 148,151 + 153,156 src/app/components/block/block.component.html - 163,167 + 168,172 Total subsidy and fees in a block block.subsidy-and-fees - - Projected + + Expected src/app/components/block/block.component.html - 210,212 + 216 - block.projected + block.expected + + + beta + + src/app/components/block/block.component.html + 216,217 + + + src/app/components/block/block.component.html + 222,224 + + beta Actual src/app/components/block/block.component.html - 212,216 + 218,222 block.actual - - Projected Block + + Expected Block src/app/components/block/block.component.html - 216,218 + 222 - block.projected-block + block.expected-block Actual Block src/app/components/block/block.component.html - 225,227 + 231 block.actual-block @@ -2748,7 +2794,7 @@ Bits src/app/components/block/block.component.html - 250,252 + 256,258 block.bits @@ -2757,7 +2803,7 @@ Merkle koren src/app/components/block/block.component.html - 254,256 + 260,262 block.merkle-root @@ -2766,7 +2812,7 @@ Težavnost src/app/components/block/block.component.html - 265,268 + 271,274 src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html @@ -2782,11 +2828,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2795,7 +2841,7 @@ Nonce src/app/components/block/block.component.html - 269,271 + 275,277 block.nonce @@ -2804,32 +2850,41 @@ Glava bloka (Hex) src/app/components/block/block.component.html - 273,274 + 279,280 block.header + + Audit + + src/app/components/block/block.component.html + 297,301 + + Toggle Audit + block.toggle-audit + Details Podrobnosti src/app/components/block/block.component.html - 284,288 + 304,308 src/app/components/transaction/transaction.component.html - 254,259 + 249,254 src/app/lightning/channel/channel.component.html - 86,88 + 93,95 src/app/lightning/channel/channel.component.html - 96,98 + 103,105 src/app/lightning/node/node.component.html - 218,222 + 221,225 Transaction Details transaction.details @@ -2839,20 +2894,16 @@ Napaka pri nalaganju podatkov. src/app/components/block/block.component.html - 303,305 + 323,325 src/app/components/block/block.component.html - 339,343 + 362,366 src/app/lightning/channel/channel-preview.component.html 70,75 - - src/app/lightning/channel/channel.component.html - 109,115 - src/app/lightning/node/node-preview.component.html 66,69 @@ -2867,7 +2918,7 @@ Why is this block empty? src/app/components/block/block.component.html - 361,367 + 384,390 block.empty-block-explanation @@ -2913,18 +2964,6 @@ latest-blocks.mined - - Health - - src/app/components/blocks-list/blocks-list.component.html - 18,19 - - - src/app/components/blocks-list/blocks-list.component.html - 18,19 - - latest-blocks.health - Reward Nagrada @@ -2988,7 +3027,7 @@ src/app/dashboard/dashboard.component.html - 210,214 + 219,223 dashboard.txs @@ -3021,13 +3060,17 @@ Difficulty Adjustment Prilagoditev težavnosti + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3035,11 +3078,11 @@ Remaining Preostalo - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3048,11 +3091,11 @@ blocks blokov - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3073,11 +3116,11 @@ block blok - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3090,11 +3133,11 @@ Estimate Ocena - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3103,20 +3146,24 @@ Previous Prejšnja - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Trenutno obdobje - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3125,11 +3172,99 @@ Next Halving Naslednja razpolovitev - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) Bodisi 2-kratnik najnižje omrežnine ali stopnja nizke prioritete (kar je nižje) @@ -3227,7 +3362,7 @@ src/app/dashboard/dashboard.component.html - 237,238 + 246,247 dashboard.incoming-transactions @@ -3240,7 +3375,7 @@ src/app/dashboard/dashboard.component.html - 240,243 + 249,252 dashboard.backend-is-synchronizing @@ -3253,7 +3388,7 @@ src/app/dashboard/dashboard.component.html - 245,250 + 254,259 vB/s shared.vbytes-per-second @@ -3267,7 +3402,7 @@ src/app/dashboard/dashboard.component.html - 208,209 + 217,218 Unconfirmed count dashboard.unconfirmed @@ -3287,7 +3422,7 @@ Rudarjenje src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3296,7 +3431,7 @@ Porazdelitev združenj src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3309,7 +3444,7 @@ Zgodovinska porazdelitev združenj src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3321,7 +3456,7 @@ Hashrate & Difficulty src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3329,7 +3464,7 @@ Lightning src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3337,7 +3472,7 @@ Lightning Nodes Per Network src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3357,7 +3492,7 @@ Lightning Network Capacity src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3377,7 +3512,7 @@ Lightning Nodes Per ISP src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3389,7 +3524,7 @@ Lightning Nodes Per Country src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3405,7 +3540,7 @@ Lightning Nodes World Map src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3421,7 +3556,7 @@ Lightning Nodes Channels World Map src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3442,11 +3577,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3476,11 +3611,11 @@ Procesorska moč (MA) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3516,7 +3651,7 @@ src/app/components/master-page/master-page.component.html - 52,54 + 51,53 src/app/components/statistics/statistics.component.ts @@ -3541,7 +3676,7 @@ Lightning Explorer src/app/components/master-page/master-page.component.html - 44,45 + 44,47 src/app/lightning/lightning-dashboard/lightning-dashboard.component.ts @@ -3549,20 +3684,12 @@ master-page.lightning - - beta - - src/app/components/master-page/master-page.component.html - 45,48 - - beta - Documentation Dokumentacija src/app/components/master-page/master-page.component.html - 55,57 + 54,56 src/app/docs/docs/docs.component.html @@ -3607,7 +3734,7 @@ Statistika nagrad src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3616,7 +3743,7 @@ (144 blokov) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3625,7 +3752,7 @@ Najnovejši bloki src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3638,10 +3765,36 @@ Prilagoditve src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments + + Broadcast Transaction + Objava transakcije + + src/app/components/mining-dashboard/mining-dashboard.component.html + 91 + + + src/app/components/push-transaction/push-transaction.component.html + 2 + + + src/app/components/push-transaction/push-transaction.component.html + 8 + + + src/app/dashboard/dashboard.component.html + 161,169 + + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 102 + + Broadcast Transaction + shared.broadcast-transaction + Pools luck (1 week) Sreča združenj (1 teden) @@ -3709,7 +3862,7 @@ src/app/components/pool-ranking/pool-ranking.component.html - 136,138 + 152,154 master-page.blocks @@ -3739,12 +3892,24 @@ mining.rank + + Avg Health + + src/app/components/pool-ranking/pool-ranking.component.html + 96,97 + + + src/app/components/pool-ranking/pool-ranking.component.html + 96,98 + + latest-blocks.avg_health + Empty blocks Prazni bloki src/app/components/pool-ranking/pool-ranking.component.html - 95,98 + 97,100 mining.empty-blocks @@ -3753,7 +3918,7 @@ Skupaj src/app/components/pool-ranking/pool-ranking.component.html - 113,114 + 129,130 mining.all-miners @@ -3762,7 +3927,7 @@ Sreča združenj (1 teden) src/app/components/pool-ranking/pool-ranking.component.html - 130,132 + 146,148 mining.miners-luck @@ -3771,7 +3936,7 @@ Število združenj (1 teden) src/app/components/pool-ranking/pool-ranking.component.html - 142,144 + 158,160 mining.miners-count @@ -3780,12 +3945,11 @@ Rudarska združenja src/app/components/pool-ranking/pool-ranking.component.ts - 57 + 58 - - blocks - blokov + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3794,6 +3958,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4006,24 +4205,6 @@ latest-blocks.coinbasetag - - Broadcast Transaction - Objava transakcije - - src/app/components/push-transaction/push-transaction.component.html - 2 - - - src/app/components/push-transaction/push-transaction.component.html - 8 - - - src/app/dashboard/dashboard.component.html - 154,161 - - Broadcast Transaction - shared.broadcast-transaction - Transaction hex Šestnajstiški zapis @@ -4033,7 +4214,7 @@ src/app/components/transaction/transaction.component.html - 296,297 + 291,292 transaction.hex @@ -4153,6 +4334,70 @@ search-form.search-title + + Bitcoin Block Height + + src/app/components/search-form/search-results/search-results.component.html + 3 + + search.bitcoin-block-height + + + Bitcoin Transaction + + src/app/components/search-form/search-results/search-results.component.html + 9 + + search.bitcoin-transaction + + + Bitcoin Address + + src/app/components/search-form/search-results/search-results.component.html + 15 + + search.bitcoin-address + + + Bitcoin Block + + src/app/components/search-form/search-results/search-results.component.html + 21 + + search.bitcoin-block + + + Bitcoin Addresses + + src/app/components/search-form/search-results/search-results.component.html + 27 + + search.bitcoin-addresses + + + Lightning Nodes + + src/app/components/search-form/search-results/search-results.component.html + 35 + + search.lightning-nodes + + + Lightning Channels + + src/app/components/search-form/search-results/search-results.component.html + 43 + + search.lightning-channels + + + Go to "" + + src/app/components/search-form/search-results/search-results.component.html + 52 + + search.go-to + Mempool by vBytes (sat/vByte) Mempool v vBajtih (sat/vBajt) @@ -4180,7 +4425,7 @@ Filter src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4189,7 +4434,7 @@ Obrni src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4198,7 +4443,7 @@ Pretočnost, vBajtov na sekundo (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4206,196 +4451,187 @@ Just now Pravkar - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago nazaj - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After Po - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - Čez ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4435,7 +4671,7 @@ src/app/components/transactions-list/transactions-list.component.html - 298,301 + 300,303 Transaction unconfirmed state transaction.unconfirmed @@ -4445,11 +4681,11 @@ Prejeto src/app/components/transaction/transaction.component.html - 108,109 + 102,103 src/app/lightning/node/node.component.html - 67,70 + 70,73 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -4465,11 +4701,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 13,15 + 15,16 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 13,15 + 15,16 Transaction first seen transaction.first-seen @@ -4479,7 +4715,7 @@ ETA src/app/components/transaction/transaction.component.html - 115,116 + 109,110 Transaction ETA transaction.eta @@ -4489,7 +4725,7 @@ V nekaj urah (ali več) src/app/components/transaction/transaction.component.html - 121,124 + 115,118 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -4499,11 +4735,11 @@ Potomec src/app/components/transaction/transaction.component.html - 168,170 + 162,164 src/app/components/transaction/transaction.component.html - 179,181 + 173,175 Descendant transaction.descendant @@ -4513,7 +4749,7 @@ Prednik src/app/components/transaction/transaction.component.html - 190,192 + 184,186 Transaction Ancestor transaction.ancestor @@ -4522,11 +4758,11 @@ Flow src/app/components/transaction/transaction.component.html - 208,211 + 202,205 src/app/components/transaction/transaction.component.html - 346,350 + 341,345 Transaction flow transaction.flow @@ -4535,7 +4771,7 @@ Hide diagram src/app/components/transaction/transaction.component.html - 211,216 + 205,210 hide-diagram @@ -4543,7 +4779,7 @@ Show more src/app/components/transaction/transaction.component.html - 231,233 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4559,7 +4795,7 @@ Show less src/app/components/transaction/transaction.component.html - 233,239 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4571,7 +4807,7 @@ Show diagram src/app/components/transaction/transaction.component.html - 253,254 + 248,249 show-diagram @@ -4580,7 +4816,7 @@ Locktime src/app/components/transaction/transaction.component.html - 292,294 + 287,289 transaction.locktime @@ -4589,7 +4825,7 @@ Transakcije ni mogoče najti. src/app/components/transaction/transaction.component.html - 455,456 + 450,451 transaction.error.transaction-not-found @@ -4598,7 +4834,7 @@ Čakanje, da se prikaže v mempool-u... src/app/components/transaction/transaction.component.html - 456,461 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4607,7 +4843,7 @@ Efektivna stopnja omrežnine src/app/components/transaction/transaction.component.html - 489,492 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -4755,7 +4991,7 @@ Show more inputs to reveal fee data src/app/components/transactions-list/transactions-list.component.html - 288,291 + 290,293 transactions-list.load-to-reveal-fee-info @@ -4763,7 +4999,7 @@ remaining src/app/components/transactions-list/transactions-list.component.html - 330,331 + 332,333 x-remaining @@ -5001,21 +5237,12 @@ dashboard.latest-transactions - - USD - USD - - src/app/dashboard/dashboard.component.html - 126,127 - - dashboard.latest-transactions.USD - Minimum fee Najnižja omrežnina src/app/dashboard/dashboard.component.html - 201,202 + 210,211 Minimum mempool fee dashboard.minimum-fee @@ -5025,7 +5252,7 @@ Prag src/app/dashboard/dashboard.component.html - 202,203 + 211,212 Purgin below fee dashboard.purging @@ -5035,7 +5262,7 @@ Velikost src/app/dashboard/dashboard.component.html - 214,215 + 223,224 Memory usage dashboard.memory-usage @@ -5045,16 +5272,28 @@ L-BTC v obtoku src/app/dashboard/dashboard.component.html - 228,230 + 237,239 dashboard.lbtc-pegs-in-circulation + + mempool.space merely provides data about the Bitcoin network. It cannot help you with retrieving funds, confirming your transaction quicker, etc. + + src/app/docs/api-docs/api-docs.component.html + 13 + + + src/app/docs/api-docs/api-docs.component.html + 14 + + faq.big-disclaimer + REST API service REST API storitev src/app/docs/api-docs/api-docs.component.html - 39,40 + 42,43 api-docs.title @@ -5063,11 +5302,11 @@ Končna točka src/app/docs/api-docs/api-docs.component.html - 48,49 + 51,52 src/app/docs/api-docs/api-docs.component.html - 102,105 + 105,108 Api docs endpoint @@ -5076,11 +5315,11 @@ Opis src/app/docs/api-docs/api-docs.component.html - 67,68 + 70,71 src/app/docs/api-docs/api-docs.component.html - 106,107 + 109,110 @@ -5088,7 +5327,7 @@ Začetni potisk: action: 'want', data: ['blocks', ...] za izbiro potisnih podatkov. Razpoložljivo: blocks, mempool-blocks, live-2h-chart in stats.Potisk transakcij povezanih z naslovom: 'track-address': '3PbJ...bF9B' za prejem vseh novih transakcij, ki vsebujejo ta naslov v vhodu ali izhodu. Vrne polje transakcij. address-transactions za nove transakcije v mempool-u in block-transactions za potrjene transakcije v novem bloku. src/app/docs/api-docs/api-docs.component.html - 107,108 + 110,111 api-docs.websocket.websocket @@ -5183,7 +5422,7 @@ src/app/lightning/node/node.component.html - 180,182 + 183,185 shared.m-sats @@ -5251,7 +5490,11 @@ src/app/lightning/channels-list/channels-list.component.html - 120,121 + 123,124 + + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 lightning.x-channels @@ -5289,11 +5532,11 @@ src/app/lightning/channel/channel.component.html - 11,12 + 13,14 src/app/lightning/channels-list/channels-list.component.html - 65,66 + 68,69 status.inactive @@ -5305,11 +5548,11 @@ src/app/lightning/channel/channel.component.html - 12,13 + 14,15 src/app/lightning/channels-list/channels-list.component.html - 66,68 + 69,71 status.active @@ -5321,7 +5564,7 @@ src/app/lightning/channel/channel.component.html - 13,14 + 15,16 src/app/lightning/channels-list/channels-list.component.html @@ -5329,7 +5572,7 @@ src/app/lightning/channels-list/channels-list.component.html - 68,70 + 71,73 status.closed @@ -5341,7 +5584,7 @@ src/app/lightning/channel/channel.component.html - 29,30 + 36,37 lightning.created @@ -5353,11 +5596,19 @@ src/app/lightning/channel/channel.component.html - 48,49 + 55,56 src/app/lightning/channels-list/channels-list.component.html - 40,43 + 43,46 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 src/app/lightning/node-statistics/node-statistics.component.html @@ -5365,7 +5616,7 @@ src/app/lightning/node-statistics/node-statistics.component.html - 47,50 + 46,49 src/app/lightning/nodes-list/nodes-list.component.html @@ -5387,6 +5638,10 @@ src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 60,62 + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 13,14 + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 202,201 @@ -5421,11 +5676,11 @@ Lightning channel src/app/lightning/channel/channel.component.html - 2,5 + 4,7 src/app/lightning/channel/channel.component.html - 117,119 + 116,118 lightning.channel @@ -5433,11 +5688,11 @@ Last update src/app/lightning/channel/channel.component.html - 33,34 + 40,41 src/app/lightning/node/node.component.html - 73,75 + 76,78 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5453,11 +5708,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 14,15 + 16,17 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 14,15 + 16,17 lightning.last-update @@ -5465,11 +5720,11 @@ Closing date src/app/lightning/channel/channel.component.html - 37,38 + 44,45 src/app/lightning/channels-list/channels-list.component.html - 39,40 + 42,44 lightning.closing_date @@ -5477,7 +5732,7 @@ Closed by src/app/lightning/channel/channel.component.html - 52,54 + 59,61 lightning.closed_by @@ -5485,7 +5740,7 @@ Opening transaction src/app/lightning/channel/channel.component.html - 84,85 + 91,92 lightning.opening-transaction @@ -5493,7 +5748,7 @@ Closing transaction src/app/lightning/channel/channel.component.html - 93,95 + 100,102 lightning.closing-transaction @@ -5504,6 +5759,27 @@ 37 + + Mutually closed + + src/app/lightning/channel/closing-type/closing-type.component.ts + 20 + + + + Force closed + + src/app/lightning/channel/closing-type/closing-type.component.ts + 24 + + + + Force closed with penalty + + src/app/lightning/channel/closing-type/closing-type.component.ts + 28 + + Open @@ -5516,7 +5792,7 @@ No channels to display src/app/lightning/channels-list/channels-list.component.html - 29,35 + 29,37 lightning.empty-channels-list @@ -5524,7 +5800,7 @@ Alias src/app/lightning/channels-list/channels-list.component.html - 35,37 + 38,40 src/app/lightning/group/group.component.html @@ -5548,11 +5824,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 10,11 + 11,12 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 10,12 + 11,13 lightning.alias @@ -5560,7 +5836,7 @@ Status src/app/lightning/channels-list/channels-list.component.html - 37,38 + 40,41 status @@ -5568,7 +5844,7 @@ Channel ID src/app/lightning/channels-list/channels-list.component.html - 41,45 + 44,48 channels.id @@ -5576,11 +5852,11 @@ sats src/app/lightning/channels-list/channels-list.component.html - 60,64 + 63,68 src/app/lightning/channels-list/channels-list.component.html - 84,88 + 87,91 src/app/lightning/channels-statistics/channels-statistics.component.html @@ -5624,6 +5900,22 @@ shared.sats + + avg + + src/app/lightning/channels-statistics/channels-statistics.component.html + 3,5 + + statistics.average-small + + + med + + src/app/lightning/channels-statistics/channels-statistics.component.html + 6,9 + + statistics.median-small + Avg Capacity @@ -5740,11 +6032,11 @@ src/app/lightning/node-statistics/node-statistics.component.html - 17,18 + 16,17 src/app/lightning/node-statistics/node-statistics.component.html - 54,57 + 53,56 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -5792,10 +6084,6 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 11,12 - - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html 12,13 lightning.liquidity @@ -5811,12 +6099,20 @@ 40,44 - src/app/lightning/node-statistics/node-statistics.component.html - 29,30 + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 src/app/lightning/node-statistics/node-statistics.component.html - 61,64 + 28,29 + + + src/app/lightning/node-statistics/node-statistics.component.html + 60,63 src/app/lightning/nodes-list/nodes-list.component.html @@ -5848,16 +6144,20 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 12,13 + 14,15 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 11,12 + 12,13 src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -5888,7 +6188,7 @@ src/app/lightning/node/node.component.html - 47,49 + 50,52 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5904,11 +6204,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 15,17 + 17,20 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 15,17 + 17,20 lightning.location @@ -5942,9 +6242,17 @@ src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 62 + + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html + 4,9 + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.ts - 29 + 33 + + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 4,9 src/app/lightning/nodes-rankings-dashboard/nodes-rankings-dashboard.component.html @@ -5972,6 +6280,28 @@ lightning.node-fee-distribution + + Outgoing Fees + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 170 + + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 208 + + + + Incoming Fees + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 178 + + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 222 + + Percentage change past week @@ -5980,11 +6310,11 @@ src/app/lightning/node-statistics/node-statistics.component.html - 18,20 + 17,19 src/app/lightning/node-statistics/node-statistics.component.html - 30,32 + 29,31 mining.percentage-change-last-week @@ -5996,11 +6326,11 @@ src/app/lightning/node/node.component.html - 2,4 + 4,6 src/app/lightning/node/node.component.html - 260,262 + 263,265 lightning.node @@ -6012,7 +6342,7 @@ src/app/lightning/node/node.component.html - 27,30 + 30,33 lightning.active-capacity @@ -6024,7 +6354,7 @@ src/app/lightning/node/node.component.html - 34,38 + 37,41 lightning.active-channels @@ -6036,19 +6366,11 @@ country - - No node found for public key "" - - src/app/lightning/node/node.component.html - 17,19 - - lightning.node-not-found - Average channel size src/app/lightning/node/node.component.html - 40,43 + 43,46 lightning.active-channels-avg @@ -6056,7 +6378,7 @@ Avg channel distance src/app/lightning/node/node.component.html - 56,57 + 59,60 lightning.avg-distance @@ -6064,7 +6386,7 @@ Color src/app/lightning/node/node.component.html - 79,81 + 82,84 lightning.color @@ -6072,7 +6394,7 @@ ISP src/app/lightning/node/node.component.html - 86,87 + 89,90 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html @@ -6084,7 +6406,7 @@ Exclusively on Tor src/app/lightning/node/node.component.html - 93,95 + 96,98 tor @@ -6092,7 +6414,7 @@ Liquidity ad src/app/lightning/node/node.component.html - 138,141 + 141,144 node.liquidity-ad @@ -6100,7 +6422,7 @@ Lease fee rate src/app/lightning/node/node.component.html - 144,147 + 147,150 Liquidity ad lease fee rate liquidity-ad.lease-fee-rate @@ -6109,7 +6431,7 @@ Lease base fee src/app/lightning/node/node.component.html - 152,154 + 155,157 liquidity-ad.lease-base-fee @@ -6117,7 +6439,7 @@ Funding weight src/app/lightning/node/node.component.html - 158,159 + 161,162 liquidity-ad.funding-weight @@ -6125,7 +6447,7 @@ Channel fee rate src/app/lightning/node/node.component.html - 168,171 + 171,174 Liquidity ad channel fee rate liquidity-ad.channel-fee-rate @@ -6134,7 +6456,7 @@ Channel base fee src/app/lightning/node/node.component.html - 176,178 + 179,181 liquidity-ad.channel-base-fee @@ -6142,7 +6464,7 @@ Compact lease src/app/lightning/node/node.component.html - 188,190 + 191,193 liquidity-ad.compact-lease @@ -6150,7 +6472,7 @@ TLV extension records src/app/lightning/node/node.component.html - 199,202 + 202,205 node.tlv.records @@ -6158,7 +6480,7 @@ Open channels src/app/lightning/node/node.component.html - 240,243 + 243,246 lightning.open-channels @@ -6166,7 +6488,7 @@ Closed channels src/app/lightning/node/node.component.html - 244,247 + 247,250 lightning.open-channels @@ -6208,7 +6530,7 @@ No geolocation data available src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts - 218,213 + 219,214 @@ -6230,8 +6552,8 @@ 112,107 - - Reachable on Clearnet Only + + Clearnet and Darknet src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -6241,8 +6563,8 @@ 303,302 - - Reachable on Clearnet and Darknet + + Clearnet Only (IPv4, IPv6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -6252,8 +6574,8 @@ 295,294 - - Reachable on Darknet Only + + Darknet Only (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -6276,25 +6598,29 @@ lightning.share - nodes + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 BTC capacity src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6400,11 +6726,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 @@ -6485,22 +6811,6 @@ 27 - - Top 100 nodes liquidity ranking - - src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 3,7 - - lightning.top-100-liquidity - - - Top 100 nodes connectivity ranking - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 3,7 - - lightning.top-100-connectivity - Oldest nodes diff --git a/frontend/src/locale/messages.th.xlf b/frontend/src/locale/messages.th.xlf index 8aea81ea2..a0adc00e4 100644 --- a/frontend/src/locale/messages.th.xlf +++ b/frontend/src/locale/messages.th.xlf @@ -11,6 +11,7 @@ Slide of + สไลด์ จาก node_modules/src/carousel/carousel.ts 175,181 @@ -147,6 +148,7 @@ + node_modules/src/progressbar/progressbar.ts 30,33 @@ -357,11 +359,11 @@ src/app/components/block/block.component.html - 290,291 + 310,311 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 26,27 + 46,47 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -382,11 +384,11 @@ src/app/components/block/block.component.html - 291,292 + 311,312 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 27,28 + 47,48 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -424,7 +426,7 @@ src/app/components/block/block.component.html - 40,41 + 38,39 block.hash @@ -449,7 +451,7 @@ src/app/components/block/block.component.html - 44,46 + 42,44 src/app/components/blocks-list/blocks-list.component.html @@ -592,11 +594,11 @@ src/app/components/master-page/master-page.component.html - 49,51 + 48,50 src/app/components/pool-ranking/pool-ranking.component.html - 94,96 + 94,95 @@ -748,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -773,16 +775,24 @@ src/app/components/about/about.component.html - 385,389 + 391,394 + + + src/app/components/mining-dashboard/mining-dashboard.component.html + 87 src/app/dashboard/dashboard.component.html - 150,152 + 157,159 src/app/docs/docs/docs.component.html 51 + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 97 + Terms of Service shared.terms-of-service @@ -793,14 +803,22 @@ src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html 113,120 + + src/app/components/mining-dashboard/mining-dashboard.component.html + 89 + src/app/dashboard/dashboard.component.html - 152,154 + 159,161 src/app/docs/docs/docs.component.html 53 + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 99 + Privacy Policy shared.privacy-policy @@ -988,7 +1006,7 @@ src/app/dashboard/dashboard.component.html - 124,125 + 124,126 @@ -1036,7 +1054,7 @@ src/app/components/transaction/transaction.component.html - 158,160 + 152,154 src/app/components/transactions-list/transactions-list.component.html @@ -1052,11 +1070,11 @@ src/app/components/block/block.component.html - 246,247 + 252,253 src/app/components/transaction/transaction.component.html - 288,290 + 283,285 transaction.version @@ -1106,7 +1124,7 @@ src/app/components/transactions-list/transactions-list.component.html - 294,295 + 296,297 Transaction singular confirmation count shared.confirmation-count.singular @@ -1128,7 +1146,7 @@ src/app/components/transactions-list/transactions-list.component.html - 295,296 + 297,298 Transaction plural confirmation count shared.confirmation-count.plural @@ -1140,10 +1158,6 @@ src/app/bisq/bisq-transaction/bisq-transaction.component.html 43,45 - - src/app/components/transaction/transaction.component.html - 65,67 - Transaction included in block transaction.included-in-block @@ -1156,11 +1170,11 @@ src/app/components/transaction/transaction.component.html - 77,80 + 71,74 src/app/components/transaction/transaction.component.html - 135,138 + 129,132 Transaction features transaction.features @@ -1188,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 262,267 + 257,262 src/app/components/transaction/transaction.component.html - 406,412 + 401,407 transaction.details @@ -1209,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 249,253 + 244,248 src/app/components/transaction/transaction.component.html - 377,383 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1231,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 241,240 + 246,245 @@ -1251,7 +1265,7 @@ src/app/components/transaction/transaction.component.html - 159,160 + 153,154 src/app/dashboard/dashboard.component.html @@ -1267,7 +1281,7 @@ src/app/components/transaction/transaction.component.html - 72,73 + 66,67 Transaction Confirmed state transaction.confirmed @@ -1438,7 +1452,7 @@ ระบบ mempool และระบบสำรวจ blockchain สำหรับคอมมูนิตี้ Bitcoin โดยมุ่งเป้าไปที่ค่าธรรมเนียมการทำธุรกรรมต่างๆบนระบบและระบบนิเวศหลายชั้น อีกทั้งยังสามารถโฮสได้ด้วยตัวเองโดยปราศจากบุคคลที่สาม src/app/components/about/about.component.html - 13,17 + 13,16 @@ -1446,7 +1460,7 @@ ผู้สนับสนุนระดับองค์กร 🚀 src/app/components/about/about.component.html - 29,32 + 19,22 about.sponsors.enterprise.withRocket @@ -1455,7 +1469,7 @@ ผู้สนับสนุน ❤️ src/app/components/about/about.component.html - 177,180 + 167,170 about.sponsors.withHeart @@ -1463,7 +1477,7 @@ Community Integrations src/app/components/about/about.component.html - 191,193 + 181,183 about.community-integrations @@ -1472,7 +1486,7 @@ พันธมิตรของเรา src/app/components/about/about.component.html - 285,287 + 291,293 about.alliances @@ -1481,7 +1495,7 @@ ผู้แปลโปรเจค src/app/components/about/about.component.html - 301,303 + 307,309 about.translators @@ -1490,7 +1504,7 @@ ผู้พัฒนาโปรเจค src/app/components/about/about.component.html - 315,317 + 321,323 about.contributors @@ -1499,7 +1513,7 @@ สมาชิกในโปรเจคนี้ src/app/components/about/about.component.html - 327,329 + 333,335 about.project_members @@ -1508,7 +1522,7 @@ ผู้ดูแลโปรเจค src/app/components/about/about.component.html - 340,342 + 346,348 about.maintainers @@ -1517,7 +1531,7 @@ เกี่ยวกับ src/app/components/about/about.component.ts - 39 + 42 src/app/components/bisq-master-page/bisq-master-page.component.html @@ -1529,11 +1543,12 @@ src/app/components/master-page/master-page.component.html - 58,61 + 57,60 Multisig of + Multisig จาก src/app/components/address-labels/address-labels.component.ts 107 @@ -1565,7 +1580,7 @@ src/app/components/amount/amount.component.html - 6,9 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -1581,7 +1596,7 @@ src/app/components/transactions-list/transactions-list.component.html - 302,304 + 304,306 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -1664,7 +1679,7 @@ src/app/components/assets/assets.component.html - 29,31 + 31,33 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -1886,7 +1901,7 @@ src/app/components/assets/assets.component.html - 30,31 + 32,33 Asset ticker header @@ -1899,7 +1914,7 @@ src/app/components/assets/assets.component.html - 31,34 + 33,36 Asset Issuer Domain header @@ -1912,7 +1927,7 @@ src/app/components/assets/assets.component.html - 32,36 + 34,38 Asset ID header @@ -1921,7 +1936,7 @@ เกิดข้อผิดพลาดในการโหลดข้อมูลสินทรัพย์ src/app/components/assets/assets.component.html - 48,53 + 50,55 Asset data load error @@ -2028,12 +2043,13 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates At block: + บล็อกที่: src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts 188 @@ -2044,11 +2060,12 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 161 + 165 Around block: + ประมาณบล็อกที่: src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts 190 @@ -2059,7 +2076,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 163 + 167 @@ -2071,11 +2088,11 @@ src/app/components/block-fees-graph/block-fees-graph.component.ts - 62 + 67 src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2084,19 +2101,19 @@ กำลังจัดเรียงบล็อก src/app/components/block-fees-graph/block-fees-graph.component.ts - 110,105 + 116,111 src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 108,103 + 113,108 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 115,110 + 116,111 src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2136,7 +2153,7 @@ src/app/components/transaction/transaction.component.html - 476 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2162,11 +2179,11 @@ src/app/components/transaction/transaction.component.html - 476,477 + 473 src/app/components/transactions-list/transactions-list.component.html - 286,287 + 288 sat shared.sat @@ -2180,11 +2197,11 @@ src/app/components/transaction/transaction.component.html - 161,165 + 155,159 src/app/components/transaction/transaction.component.html - 479,481 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2196,7 +2213,7 @@ src/app/lightning/channels-list/channels-list.component.html - 38,39 + 41,43 Transaction fee rate transaction.fee-rate @@ -2214,19 +2231,19 @@ src/app/components/block/block.component.html - 125,128 + 124,127 src/app/components/block/block.component.html - 129 + 128,130 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 12,14 + 19,22 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 15,17 + 30,33 src/app/components/fees-box/fees-box.component.html @@ -2266,27 +2283,27 @@ src/app/components/transaction/transaction.component.html - 173,174 + 167,168 src/app/components/transaction/transaction.component.html - 184,185 + 178,179 src/app/components/transaction/transaction.component.html - 195,196 + 189,190 src/app/components/transaction/transaction.component.html - 481,484 + 478,481 src/app/components/transaction/transaction.component.html - 492,494 + 489,491 src/app/components/transactions-list/transactions-list.component.html - 286 + 286,287 src/app/dashboard/dashboard.component.html @@ -2294,7 +2311,7 @@ src/app/dashboard/dashboard.component.html - 204,208 + 213,217 sat/vB shared.sat-vbyte @@ -2308,11 +2325,11 @@ src/app/components/transaction/transaction.component.html - 160,162 + 154,156 src/app/components/transaction/transaction.component.html - 274,277 + 269,272 Transaction Virtual Size transaction.vsize @@ -2381,7 +2398,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2416,11 +2433,11 @@ src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 60 + 65 src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2437,7 +2454,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2446,15 +2463,15 @@ ขนาด src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 180,179 + 184,183 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 226,224 + 239,237 src/app/components/block/block.component.html - 50,52 + 48,50 src/app/components/blocks-list/blocks-list.component.html @@ -2478,7 +2495,7 @@ src/app/components/transaction/transaction.component.html - 270,272 + 265,267 src/app/dashboard/dashboard.component.html @@ -2490,11 +2507,11 @@ น้ำหนัก src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 188,187 + 192,191 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 257,254 + 270,267 src/app/components/block/block-preview.component.html @@ -2502,11 +2519,22 @@ src/app/components/block/block.component.html - 54,56 + 52,54 src/app/components/transaction/transaction.component.html - 278,280 + 273,275 + + + + Size per weight + + src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts + 200,199 + + + src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts + 282,279 @@ -2521,14 +2549,6 @@ shared.block-title - - - - src/app/components/block/block-preview.component.html - 11,12 - - shared.block-title - Median fee ค่าธรรมเนียมกลาง @@ -2538,7 +2558,7 @@ src/app/components/block/block.component.html - 128,129 + 127,128 src/app/components/mempool-block/mempool-block.component.html @@ -2555,11 +2575,11 @@ src/app/components/block/block.component.html - 133,135 + 138,140 src/app/components/block/block.component.html - 159,162 + 164,167 src/app/components/mempool-block/mempool-block.component.html @@ -2577,7 +2597,7 @@ src/app/components/block/block.component.html - 168,170 + 173,175 block.miner @@ -2590,7 +2610,7 @@ src/app/components/block/block.component.ts - 227 + 242 @@ -2600,6 +2620,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2615,31 +2639,47 @@ Previous Block - - Block health + + Health src/app/components/block/block.component.html - 58,61 + 56 - block.health + + src/app/components/blocks-list/blocks-list.component.html + 18,19 + + + src/app/components/blocks-list/blocks-list.component.html + 18,19 + + latest-blocks.health Unknown src/app/components/block/block.component.html - 69,72 + 67,70 src/app/components/blocks-list/blocks-list.component.html 60,63 - src/app/lightning/node/node.component.html - 52,55 + src/app/components/pool-ranking/pool-ranking.component.html + 121,124 + + + src/app/lightning/channel/closing-type/closing-type.component.ts + 32 src/app/lightning/node/node.component.html - 96,100 + 55,58 + + + src/app/lightning/node/node.component.html + 99,103 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts @@ -2656,7 +2696,7 @@ ช่วงของค่าธรรมเนียม src/app/components/block/block.component.html - 124,125 + 123,124 src/app/components/mempool-block/mempool-block.component.html @@ -2669,7 +2709,7 @@ อิงตามธุรกรรม Segwit ดั้งเดิมที่มีค่าเฉลี่ย 140 vBytes src/app/components/block/block.component.html - 129,131 + 131,136 src/app/components/fees-box/fees-box.component.html @@ -2693,49 +2733,60 @@ Transaction fee tooltip - - Subsidy + fees: - ธุรกรรม + ค่าธรรมเนียม: + + Subsidy + fees src/app/components/block/block.component.html - 148,151 + 153,156 src/app/components/block/block.component.html - 163,167 + 168,172 Total subsidy and fees in a block block.subsidy-and-fees - - Projected + + Expected src/app/components/block/block.component.html - 210,212 + 216 - block.projected + block.expected + + + beta + + src/app/components/block/block.component.html + 216,217 + + + src/app/components/block/block.component.html + 222,224 + + beta Actual src/app/components/block/block.component.html - 212,216 + 218,222 block.actual - - Projected Block + + Expected Block src/app/components/block/block.component.html - 216,218 + 222 - block.projected-block + block.expected-block Actual Block src/app/components/block/block.component.html - 225,227 + 231 block.actual-block @@ -2744,7 +2795,7 @@ บิต src/app/components/block/block.component.html - 250,252 + 256,258 block.bits @@ -2753,7 +2804,7 @@ Merkle root src/app/components/block/block.component.html - 254,256 + 260,262 block.merkle-root @@ -2762,7 +2813,7 @@ ความยาก src/app/components/block/block.component.html - 265,268 + 271,274 src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html @@ -2778,11 +2829,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2791,7 +2842,7 @@ Nonce src/app/components/block/block.component.html - 269,271 + 275,277 block.nonce @@ -2800,32 +2851,41 @@ Hex ส่วนหัวบล็อก src/app/components/block/block.component.html - 273,274 + 279,280 block.header + + Audit + + src/app/components/block/block.component.html + 297,301 + + Toggle Audit + block.toggle-audit + Details รายละเอียด src/app/components/block/block.component.html - 284,288 + 304,308 src/app/components/transaction/transaction.component.html - 254,259 + 249,254 src/app/lightning/channel/channel.component.html - 86,88 + 93,95 src/app/lightning/channel/channel.component.html - 96,98 + 103,105 src/app/lightning/node/node.component.html - 218,222 + 221,225 Transaction Details transaction.details @@ -2835,20 +2895,16 @@ เกิดข้อผิดพลาดในการโหลดข้อมูล src/app/components/block/block.component.html - 303,305 + 323,325 src/app/components/block/block.component.html - 339,343 + 362,366 src/app/lightning/channel/channel-preview.component.html 70,75 - - src/app/lightning/channel/channel.component.html - 109,115 - src/app/lightning/node/node-preview.component.html 66,69 @@ -2863,7 +2919,7 @@ Why is this block empty? src/app/components/block/block.component.html - 361,367 + 384,390 block.empty-block-explanation @@ -2909,18 +2965,6 @@ latest-blocks.mined - - Health - - src/app/components/blocks-list/blocks-list.component.html - 18,19 - - - src/app/components/blocks-list/blocks-list.component.html - 18,19 - - latest-blocks.health - Reward ค่าตอบแทน @@ -2984,7 +3028,7 @@ src/app/dashboard/dashboard.component.html - 210,214 + 219,223 dashboard.txs @@ -3017,13 +3061,17 @@ Difficulty Adjustment การเปลี่ยนแปลงระดับความยาก + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3031,11 +3079,11 @@ Remaining คงเหลือ - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3044,11 +3092,11 @@ blocks บล็อก - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3069,11 +3117,11 @@ block บล็อก - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3086,11 +3134,11 @@ Estimate ประมาณ - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3099,20 +3147,24 @@ Previous ก่อนหน้า - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period ช่วงเวลาปัจจุบัน - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3121,11 +3173,99 @@ Next Halving การลดผลตอบแทนครั้งถัดไป - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) 2 เท่าของค่าต่ำสุดหรือความสำคัญต่ำ (อะไรก็ได้ที่ต่ำกว่า) @@ -3221,7 +3361,7 @@ src/app/dashboard/dashboard.component.html - 237,238 + 246,247 dashboard.incoming-transactions @@ -3234,7 +3374,7 @@ src/app/dashboard/dashboard.component.html - 240,243 + 249,252 dashboard.backend-is-synchronizing @@ -3247,7 +3387,7 @@ src/app/dashboard/dashboard.component.html - 245,250 + 254,259 vB/s shared.vbytes-per-second @@ -3261,7 +3401,7 @@ src/app/dashboard/dashboard.component.html - 208,209 + 217,218 Unconfirmed count dashboard.unconfirmed @@ -3281,7 +3421,7 @@ กำลังขุด src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3290,7 +3430,7 @@ อันดับพูล src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3303,7 +3443,7 @@ การครองระบบพูล src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3315,7 +3455,7 @@ Hashrate & Difficulty src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3323,7 +3463,7 @@ Lightning src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3331,7 +3471,7 @@ Lightning Nodes Per Network src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3351,7 +3491,7 @@ Lightning Network Capacity src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3371,7 +3511,7 @@ Lightning Nodes Per ISP src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3383,7 +3523,7 @@ Lightning Nodes Per Country src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3399,7 +3539,7 @@ Lightning Nodes World Map src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3415,7 +3555,7 @@ Lightning Nodes Channels World Map src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3436,11 +3576,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3469,11 +3609,11 @@ Hashrate (MA) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3509,7 +3649,7 @@ src/app/components/master-page/master-page.component.html - 52,54 + 51,53 src/app/components/statistics/statistics.component.ts @@ -3534,7 +3674,7 @@ Lightning Explorer src/app/components/master-page/master-page.component.html - 44,45 + 44,47 src/app/lightning/lightning-dashboard/lightning-dashboard.component.ts @@ -3542,20 +3682,12 @@ master-page.lightning - - beta - - src/app/components/master-page/master-page.component.html - 45,48 - - beta - Documentation เอกสารคำอภิบาย src/app/components/master-page/master-page.component.html - 55,57 + 54,56 src/app/docs/docs/docs.component.html @@ -3600,7 +3732,7 @@ สถานะค่าตอบแทน src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3609,7 +3741,7 @@ (144 บล็อก) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3618,7 +3750,7 @@ บล็อกล่าสุด src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3631,10 +3763,36 @@ การเปลี่ยนแปลง src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments + + Broadcast Transaction + ประกาศธุรกรรม + + src/app/components/mining-dashboard/mining-dashboard.component.html + 91 + + + src/app/components/push-transaction/push-transaction.component.html + 2 + + + src/app/components/push-transaction/push-transaction.component.html + 8 + + + src/app/dashboard/dashboard.component.html + 161,169 + + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 102 + + Broadcast Transaction + shared.broadcast-transaction + Pools luck (1 week) @@ -3696,7 +3854,7 @@ src/app/components/pool-ranking/pool-ranking.component.html - 136,138 + 152,154 master-page.blocks @@ -3725,12 +3883,24 @@ mining.rank + + Avg Health + + src/app/components/pool-ranking/pool-ranking.component.html + 96,97 + + + src/app/components/pool-ranking/pool-ranking.component.html + 96,98 + + latest-blocks.avg_health + Empty blocks บล็อกว่างเปล่า src/app/components/pool-ranking/pool-ranking.component.html - 95,98 + 97,100 mining.empty-blocks @@ -3739,7 +3909,7 @@ ผู้ขุดทั้งหมด src/app/components/pool-ranking/pool-ranking.component.html - 113,114 + 129,130 mining.all-miners @@ -3748,7 +3918,7 @@ ความโชคดีของพูล (1 สัปดาห์) src/app/components/pool-ranking/pool-ranking.component.html - 130,132 + 146,148 mining.miners-luck @@ -3757,7 +3927,7 @@ จำนวนผู้ขุดในพูล (1 สัปดาห์) src/app/components/pool-ranking/pool-ranking.component.html - 142,144 + 158,160 mining.miners-count @@ -3766,12 +3936,11 @@ พูลขุด src/app/components/pool-ranking/pool-ranking.component.ts - 57 + 58 - - blocks - บล็อก + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3780,6 +3949,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -3992,24 +4196,6 @@ latest-blocks.coinbasetag - - Broadcast Transaction - ประกาศธุรกรรม - - src/app/components/push-transaction/push-transaction.component.html - 2 - - - src/app/components/push-transaction/push-transaction.component.html - 8 - - - src/app/dashboard/dashboard.component.html - 154,161 - - Broadcast Transaction - shared.broadcast-transaction - Transaction hex hex ของธุรกรรม @@ -4019,7 +4205,7 @@ src/app/components/transaction/transaction.component.html - 296,297 + 291,292 transaction.hex @@ -4139,6 +4325,70 @@ search-form.search-title + + Bitcoin Block Height + + src/app/components/search-form/search-results/search-results.component.html + 3 + + search.bitcoin-block-height + + + Bitcoin Transaction + + src/app/components/search-form/search-results/search-results.component.html + 9 + + search.bitcoin-transaction + + + Bitcoin Address + + src/app/components/search-form/search-results/search-results.component.html + 15 + + search.bitcoin-address + + + Bitcoin Block + + src/app/components/search-form/search-results/search-results.component.html + 21 + + search.bitcoin-block + + + Bitcoin Addresses + + src/app/components/search-form/search-results/search-results.component.html + 27 + + search.bitcoin-addresses + + + Lightning Nodes + + src/app/components/search-form/search-results/search-results.component.html + 35 + + search.lightning-nodes + + + Lightning Channels + + src/app/components/search-form/search-results/search-results.component.html + 43 + + search.lightning-channels + + + Go to "" + + src/app/components/search-form/search-results/search-results.component.html + 52 + + search.go-to + Mempool by vBytes (sat/vByte) ขนาดหน่วยความจำ vBytes (sat/vByte) @@ -4166,7 +4416,7 @@ ตัวกรอง src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4175,7 +4425,7 @@ กลับ src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4184,7 +4434,7 @@ ธุรกรรมต่อวินาที (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4192,196 +4442,187 @@ Just now ตอนนี้ - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago ที่ผ่านมา - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After หลังจาก - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - ภายใน ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4421,7 +4662,7 @@ src/app/components/transactions-list/transactions-list.component.html - 298,301 + 300,303 Transaction unconfirmed state transaction.unconfirmed @@ -4431,11 +4672,11 @@ พบเห็นครั้งแรก src/app/components/transaction/transaction.component.html - 108,109 + 102,103 src/app/lightning/node/node.component.html - 67,70 + 70,73 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -4451,11 +4692,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 13,15 + 15,16 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 13,15 + 15,16 Transaction first seen transaction.first-seen @@ -4465,7 +4706,7 @@ ETA src/app/components/transaction/transaction.component.html - 115,116 + 109,110 Transaction ETA transaction.eta @@ -4475,7 +4716,7 @@ ภายในหลายชั่วโมง (หรือมากกว่า) src/app/components/transaction/transaction.component.html - 121,124 + 115,118 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -4485,11 +4726,11 @@ ผู้สืบทอด src/app/components/transaction/transaction.component.html - 168,170 + 162,164 src/app/components/transaction/transaction.component.html - 179,181 + 173,175 Descendant transaction.descendant @@ -4499,7 +4740,7 @@ บรรพบุรุษ src/app/components/transaction/transaction.component.html - 190,192 + 184,186 Transaction Ancestor transaction.ancestor @@ -4508,11 +4749,11 @@ Flow src/app/components/transaction/transaction.component.html - 208,211 + 202,205 src/app/components/transaction/transaction.component.html - 346,350 + 341,345 Transaction flow transaction.flow @@ -4521,7 +4762,7 @@ Hide diagram src/app/components/transaction/transaction.component.html - 211,216 + 205,210 hide-diagram @@ -4529,7 +4770,7 @@ Show more src/app/components/transaction/transaction.component.html - 231,233 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4545,7 +4786,7 @@ Show less src/app/components/transaction/transaction.component.html - 233,239 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4557,7 +4798,7 @@ Show diagram src/app/components/transaction/transaction.component.html - 253,254 + 248,249 show-diagram @@ -4566,7 +4807,7 @@ เวลาล็อก src/app/components/transaction/transaction.component.html - 292,294 + 287,289 transaction.locktime @@ -4575,7 +4816,7 @@ ไม่พบเจอธุรกรรมนี้ src/app/components/transaction/transaction.component.html - 455,456 + 450,451 transaction.error.transaction-not-found @@ -4584,7 +4825,7 @@ กำลังรอให้ปรากฏใน mempool... src/app/components/transaction/transaction.component.html - 456,461 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4593,7 +4834,7 @@ อัตราค่าธรรมเนียมที่เหมาะสม src/app/components/transaction/transaction.component.html - 489,492 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -4741,7 +4982,7 @@ Show more inputs to reveal fee data src/app/components/transactions-list/transactions-list.component.html - 288,291 + 290,293 transactions-list.load-to-reveal-fee-info @@ -4749,7 +4990,7 @@ remaining src/app/components/transactions-list/transactions-list.component.html - 330,331 + 332,333 x-remaining @@ -4987,21 +5228,12 @@ dashboard.latest-transactions - - USD - USD - - src/app/dashboard/dashboard.component.html - 126,127 - - dashboard.latest-transactions.USD - Minimum fee ค่าธรรมเนียมขั้นต่ำ src/app/dashboard/dashboard.component.html - 201,202 + 210,211 Minimum mempool fee dashboard.minimum-fee @@ -5011,7 +5243,7 @@ กำลังล้าง src/app/dashboard/dashboard.component.html - 202,203 + 211,212 Purgin below fee dashboard.purging @@ -5021,7 +5253,7 @@ หน่วยความจำที่ใช้ไป src/app/dashboard/dashboard.component.html - 214,215 + 223,224 Memory usage dashboard.memory-usage @@ -5031,15 +5263,27 @@ อุปทานหมุนเวียน L-BTC src/app/dashboard/dashboard.component.html - 228,230 + 237,239 dashboard.lbtc-pegs-in-circulation + + mempool.space merely provides data about the Bitcoin network. It cannot help you with retrieving funds, confirming your transaction quicker, etc. + + src/app/docs/api-docs/api-docs.component.html + 13 + + + src/app/docs/api-docs/api-docs.component.html + 14 + + faq.big-disclaimer + REST API service src/app/docs/api-docs/api-docs.component.html - 39,40 + 42,43 api-docs.title @@ -5048,11 +5292,11 @@ ปลายทาง src/app/docs/api-docs/api-docs.component.html - 48,49 + 51,52 src/app/docs/api-docs/api-docs.component.html - 102,105 + 105,108 Api docs endpoint @@ -5061,11 +5305,11 @@ คำอธิบาย src/app/docs/api-docs/api-docs.component.html - 67,68 + 70,71 src/app/docs/api-docs/api-docs.component.html - 106,107 + 109,110 @@ -5073,7 +5317,7 @@ ค่าตอบกลับพื้นฐาน: การกระทำ: 'ต้องการ', ข้อมูล: ['บล็อก', ...] เพื่ออธิบายค่าที่ต้องการตอบกลับ. ที่ใช้งานได้: บล็อก, บล็อก-mempool, ชาตสด-2h, และ สถิติ.ส่งธุรกรรมไปยังแอดเดรส: 'track-address': '3PbJ...bF9B' เพื่อที่จะได้รับธุรกรรมใหม่ทั้งหมดที่มี input/output ของแอดเดรสนั้น. ตอบกลับเป็นอาเรย์ของธุรกรรม. แอดเดรส-ธุรกรรม สำหรับธุรกรรม mempool ใหม่, และ ธุรกรรม-บล็อก สำหรับธุรกรรมที่ถูกยืนยันในบล็อกใหม่ src/app/docs/api-docs/api-docs.component.html - 107,108 + 110,111 api-docs.websocket.websocket @@ -5168,7 +5412,7 @@ src/app/lightning/node/node.component.html - 180,182 + 183,185 shared.m-sats @@ -5236,7 +5480,11 @@ src/app/lightning/channels-list/channels-list.component.html - 120,121 + 123,124 + + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 lightning.x-channels @@ -5274,11 +5522,11 @@ src/app/lightning/channel/channel.component.html - 11,12 + 13,14 src/app/lightning/channels-list/channels-list.component.html - 65,66 + 68,69 status.inactive @@ -5290,11 +5538,11 @@ src/app/lightning/channel/channel.component.html - 12,13 + 14,15 src/app/lightning/channels-list/channels-list.component.html - 66,68 + 69,71 status.active @@ -5306,7 +5554,7 @@ src/app/lightning/channel/channel.component.html - 13,14 + 15,16 src/app/lightning/channels-list/channels-list.component.html @@ -5314,7 +5562,7 @@ src/app/lightning/channels-list/channels-list.component.html - 68,70 + 71,73 status.closed @@ -5326,7 +5574,7 @@ src/app/lightning/channel/channel.component.html - 29,30 + 36,37 lightning.created @@ -5338,11 +5586,19 @@ src/app/lightning/channel/channel.component.html - 48,49 + 55,56 src/app/lightning/channels-list/channels-list.component.html - 40,43 + 43,46 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 src/app/lightning/node-statistics/node-statistics.component.html @@ -5350,7 +5606,7 @@ src/app/lightning/node-statistics/node-statistics.component.html - 47,50 + 46,49 src/app/lightning/nodes-list/nodes-list.component.html @@ -5372,6 +5628,10 @@ src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 60,62 + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 13,14 + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 202,201 @@ -5406,11 +5666,11 @@ Lightning channel src/app/lightning/channel/channel.component.html - 2,5 + 4,7 src/app/lightning/channel/channel.component.html - 117,119 + 116,118 lightning.channel @@ -5418,11 +5678,11 @@ Last update src/app/lightning/channel/channel.component.html - 33,34 + 40,41 src/app/lightning/node/node.component.html - 73,75 + 76,78 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5438,11 +5698,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 14,15 + 16,17 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 14,15 + 16,17 lightning.last-update @@ -5450,11 +5710,11 @@ Closing date src/app/lightning/channel/channel.component.html - 37,38 + 44,45 src/app/lightning/channels-list/channels-list.component.html - 39,40 + 42,44 lightning.closing_date @@ -5462,7 +5722,7 @@ Closed by src/app/lightning/channel/channel.component.html - 52,54 + 59,61 lightning.closed_by @@ -5470,7 +5730,7 @@ Opening transaction src/app/lightning/channel/channel.component.html - 84,85 + 91,92 lightning.opening-transaction @@ -5478,7 +5738,7 @@ Closing transaction src/app/lightning/channel/channel.component.html - 93,95 + 100,102 lightning.closing-transaction @@ -5489,6 +5749,27 @@ 37 + + Mutually closed + + src/app/lightning/channel/closing-type/closing-type.component.ts + 20 + + + + Force closed + + src/app/lightning/channel/closing-type/closing-type.component.ts + 24 + + + + Force closed with penalty + + src/app/lightning/channel/closing-type/closing-type.component.ts + 28 + + Open @@ -5501,7 +5782,7 @@ No channels to display src/app/lightning/channels-list/channels-list.component.html - 29,35 + 29,37 lightning.empty-channels-list @@ -5509,7 +5790,7 @@ Alias src/app/lightning/channels-list/channels-list.component.html - 35,37 + 38,40 src/app/lightning/group/group.component.html @@ -5533,11 +5814,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 10,11 + 11,12 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 10,12 + 11,13 lightning.alias @@ -5545,7 +5826,7 @@ Status src/app/lightning/channels-list/channels-list.component.html - 37,38 + 40,41 status @@ -5553,7 +5834,7 @@ Channel ID src/app/lightning/channels-list/channels-list.component.html - 41,45 + 44,48 channels.id @@ -5561,11 +5842,11 @@ sats src/app/lightning/channels-list/channels-list.component.html - 60,64 + 63,68 src/app/lightning/channels-list/channels-list.component.html - 84,88 + 87,91 src/app/lightning/channels-statistics/channels-statistics.component.html @@ -5609,6 +5890,22 @@ shared.sats + + avg + + src/app/lightning/channels-statistics/channels-statistics.component.html + 3,5 + + statistics.average-small + + + med + + src/app/lightning/channels-statistics/channels-statistics.component.html + 6,9 + + statistics.median-small + Avg Capacity @@ -5725,11 +6022,11 @@ src/app/lightning/node-statistics/node-statistics.component.html - 17,18 + 16,17 src/app/lightning/node-statistics/node-statistics.component.html - 54,57 + 53,56 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -5777,10 +6074,6 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 11,12 - - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html 12,13 lightning.liquidity @@ -5796,12 +6089,20 @@ 40,44 - src/app/lightning/node-statistics/node-statistics.component.html - 29,30 + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 src/app/lightning/node-statistics/node-statistics.component.html - 61,64 + 28,29 + + + src/app/lightning/node-statistics/node-statistics.component.html + 60,63 src/app/lightning/nodes-list/nodes-list.component.html @@ -5833,16 +6134,20 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 12,13 + 14,15 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 11,12 + 12,13 src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -5873,7 +6178,7 @@ src/app/lightning/node/node.component.html - 47,49 + 50,52 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5889,11 +6194,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 15,17 + 17,20 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 15,17 + 17,20 lightning.location @@ -5927,9 +6232,17 @@ src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 62 + + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html + 4,9 + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.ts - 29 + 33 + + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 4,9 src/app/lightning/nodes-rankings-dashboard/nodes-rankings-dashboard.component.html @@ -5957,6 +6270,28 @@ lightning.node-fee-distribution + + Outgoing Fees + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 170 + + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 208 + + + + Incoming Fees + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 178 + + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 222 + + Percentage change past week @@ -5965,11 +6300,11 @@ src/app/lightning/node-statistics/node-statistics.component.html - 18,20 + 17,19 src/app/lightning/node-statistics/node-statistics.component.html - 30,32 + 29,31 mining.percentage-change-last-week @@ -5981,11 +6316,11 @@ src/app/lightning/node/node.component.html - 2,4 + 4,6 src/app/lightning/node/node.component.html - 260,262 + 263,265 lightning.node @@ -5997,7 +6332,7 @@ src/app/lightning/node/node.component.html - 27,30 + 30,33 lightning.active-capacity @@ -6009,7 +6344,7 @@ src/app/lightning/node/node.component.html - 34,38 + 37,41 lightning.active-channels @@ -6021,19 +6356,11 @@ country - - No node found for public key "" - - src/app/lightning/node/node.component.html - 17,19 - - lightning.node-not-found - Average channel size src/app/lightning/node/node.component.html - 40,43 + 43,46 lightning.active-channels-avg @@ -6041,7 +6368,7 @@ Avg channel distance src/app/lightning/node/node.component.html - 56,57 + 59,60 lightning.avg-distance @@ -6049,7 +6376,7 @@ Color src/app/lightning/node/node.component.html - 79,81 + 82,84 lightning.color @@ -6057,7 +6384,7 @@ ISP src/app/lightning/node/node.component.html - 86,87 + 89,90 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html @@ -6069,7 +6396,7 @@ Exclusively on Tor src/app/lightning/node/node.component.html - 93,95 + 96,98 tor @@ -6077,7 +6404,7 @@ Liquidity ad src/app/lightning/node/node.component.html - 138,141 + 141,144 node.liquidity-ad @@ -6085,7 +6412,7 @@ Lease fee rate src/app/lightning/node/node.component.html - 144,147 + 147,150 Liquidity ad lease fee rate liquidity-ad.lease-fee-rate @@ -6094,7 +6421,7 @@ Lease base fee src/app/lightning/node/node.component.html - 152,154 + 155,157 liquidity-ad.lease-base-fee @@ -6102,7 +6429,7 @@ Funding weight src/app/lightning/node/node.component.html - 158,159 + 161,162 liquidity-ad.funding-weight @@ -6110,7 +6437,7 @@ Channel fee rate src/app/lightning/node/node.component.html - 168,171 + 171,174 Liquidity ad channel fee rate liquidity-ad.channel-fee-rate @@ -6119,7 +6446,7 @@ Channel base fee src/app/lightning/node/node.component.html - 176,178 + 179,181 liquidity-ad.channel-base-fee @@ -6127,7 +6454,7 @@ Compact lease src/app/lightning/node/node.component.html - 188,190 + 191,193 liquidity-ad.compact-lease @@ -6135,7 +6462,7 @@ TLV extension records src/app/lightning/node/node.component.html - 199,202 + 202,205 node.tlv.records @@ -6143,7 +6470,7 @@ Open channels src/app/lightning/node/node.component.html - 240,243 + 243,246 lightning.open-channels @@ -6151,7 +6478,7 @@ Closed channels src/app/lightning/node/node.component.html - 244,247 + 247,250 lightning.open-channels @@ -6193,7 +6520,7 @@ No geolocation data available src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts - 218,213 + 219,214 @@ -6215,8 +6542,8 @@ 112,107 - - Reachable on Clearnet Only + + Clearnet and Darknet src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -6226,8 +6553,8 @@ 303,302 - - Reachable on Clearnet and Darknet + + Clearnet Only (IPv4, IPv6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -6237,8 +6564,8 @@ 295,294 - - Reachable on Darknet Only + + Darknet Only (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -6261,25 +6588,29 @@ lightning.share - nodes + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 BTC capacity src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6385,11 +6716,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 @@ -6470,22 +6801,6 @@ 27 - - Top 100 nodes liquidity ranking - - src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 3,7 - - lightning.top-100-liquidity - - - Top 100 nodes connectivity ranking - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 3,7 - - lightning.top-100-connectivity - Oldest nodes diff --git a/frontend/src/locale/messages.tr.xlf b/frontend/src/locale/messages.tr.xlf index b74f46bc4..3ef9c25ba 100644 --- a/frontend/src/locale/messages.tr.xlf +++ b/frontend/src/locale/messages.tr.xlf @@ -11,6 +11,7 @@ Slide of + Slayt 'nin 'i node_modules/src/carousel/carousel.ts 175,181 @@ -147,6 +148,7 @@ + node_modules/src/progressbar/progressbar.ts 30,33 @@ -357,11 +359,11 @@ src/app/components/block/block.component.html - 290,291 + 310,311 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 26,27 + 46,47 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -382,11 +384,11 @@ src/app/components/block/block.component.html - 291,292 + 311,312 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 27,28 + 47,48 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -424,7 +426,7 @@ src/app/components/block/block.component.html - 40,41 + 38,39 block.hash @@ -449,7 +451,7 @@ src/app/components/block/block.component.html - 44,46 + 42,44 src/app/components/blocks-list/blocks-list.component.html @@ -592,11 +594,11 @@ src/app/components/master-page/master-page.component.html - 49,51 + 48,50 src/app/components/pool-ranking/pool-ranking.component.html - 94,96 + 94,95 @@ -748,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -773,16 +775,24 @@ src/app/components/about/about.component.html - 385,389 + 391,394 + + + src/app/components/mining-dashboard/mining-dashboard.component.html + 87 src/app/dashboard/dashboard.component.html - 150,152 + 157,159 src/app/docs/docs/docs.component.html 51 + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 97 + Terms of Service shared.terms-of-service @@ -793,14 +803,22 @@ src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html 113,120 + + src/app/components/mining-dashboard/mining-dashboard.component.html + 89 + src/app/dashboard/dashboard.component.html - 152,154 + 159,161 src/app/docs/docs/docs.component.html 53 + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 99 + Privacy Policy shared.privacy-policy @@ -988,7 +1006,7 @@ src/app/dashboard/dashboard.component.html - 124,125 + 124,126 @@ -1036,7 +1054,7 @@ src/app/components/transaction/transaction.component.html - 158,160 + 152,154 src/app/components/transactions-list/transactions-list.component.html @@ -1052,11 +1070,11 @@ src/app/components/block/block.component.html - 246,247 + 252,253 src/app/components/transaction/transaction.component.html - 288,290 + 283,285 transaction.version @@ -1106,7 +1124,7 @@ src/app/components/transactions-list/transactions-list.component.html - 294,295 + 296,297 Transaction singular confirmation count shared.confirmation-count.singular @@ -1128,7 +1146,7 @@ src/app/components/transactions-list/transactions-list.component.html - 295,296 + 297,298 Transaction plural confirmation count shared.confirmation-count.plural @@ -1140,10 +1158,6 @@ src/app/bisq/bisq-transaction/bisq-transaction.component.html 43,45 - - src/app/components/transaction/transaction.component.html - 65,67 - Transaction included in block transaction.included-in-block @@ -1156,11 +1170,11 @@ src/app/components/transaction/transaction.component.html - 77,80 + 71,74 src/app/components/transaction/transaction.component.html - 135,138 + 129,132 Transaction features transaction.features @@ -1188,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 262,267 + 257,262 src/app/components/transaction/transaction.component.html - 406,412 + 401,407 transaction.details @@ -1209,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 249,253 + 244,248 src/app/components/transaction/transaction.component.html - 377,383 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1231,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 241,240 + 246,245 @@ -1251,7 +1265,7 @@ src/app/components/transaction/transaction.component.html - 159,160 + 153,154 src/app/dashboard/dashboard.component.html @@ -1267,7 +1281,7 @@ src/app/components/transaction/transaction.component.html - 72,73 + 66,67 Transaction Confirmed state transaction.confirmed @@ -1438,7 +1452,7 @@ Mempool, üçüncü partilere güvenmek zorunda kalmadan kendi bilgisayarınızda barındırabileceğiniz, Bitcoin ve ikinci katman çözümleri için işlem ücreti piyasasını önünüze sunan açık kaynak kodlu bir blok kaşifi yazılımıdır. src/app/components/about/about.component.html - 13,17 + 13,16 @@ -1446,7 +1460,7 @@ Kurumsal sponsorlar src/app/components/about/about.component.html - 29,32 + 19,22 about.sponsors.enterprise.withRocket @@ -1455,7 +1469,7 @@ Topluluk sponsorlarımız src/app/components/about/about.component.html - 177,180 + 167,170 about.sponsors.withHeart @@ -1464,7 +1478,7 @@ Topluluk İntegrasyonları src/app/components/about/about.component.html - 191,193 + 181,183 about.community-integrations @@ -1473,7 +1487,7 @@ Topluluk İşbirlikleri src/app/components/about/about.component.html - 285,287 + 291,293 about.alliances @@ -1482,7 +1496,7 @@ Proje Çeviricileri src/app/components/about/about.component.html - 301,303 + 307,309 about.translators @@ -1491,7 +1505,7 @@ Proje Destekçileri src/app/components/about/about.component.html - 315,317 + 321,323 about.contributors @@ -1500,7 +1514,7 @@ Proje Üyeleri src/app/components/about/about.component.html - 327,329 + 333,335 about.project_members @@ -1509,7 +1523,7 @@ Projeyi ayakta tutanlar src/app/components/about/about.component.html - 340,342 + 346,348 about.maintainers @@ -1518,7 +1532,7 @@ Hakkında src/app/components/about/about.component.ts - 39 + 42 src/app/components/bisq-master-page/bisq-master-page.component.html @@ -1530,7 +1544,7 @@ src/app/components/master-page/master-page.component.html - 58,61 + 57,60 @@ -1567,7 +1581,7 @@ src/app/components/amount/amount.component.html - 6,9 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -1583,7 +1597,7 @@ src/app/components/transactions-list/transactions-list.component.html - 302,304 + 304,306 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -1666,7 +1680,7 @@ src/app/components/assets/assets.component.html - 29,31 + 31,33 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -1888,7 +1902,7 @@ src/app/components/assets/assets.component.html - 30,31 + 32,33 Asset ticker header @@ -1901,7 +1915,7 @@ src/app/components/assets/assets.component.html - 31,34 + 33,36 Asset Issuer Domain header @@ -1914,7 +1928,7 @@ src/app/components/assets/assets.component.html - 32,36 + 34,38 Asset ID header @@ -1923,7 +1937,7 @@ Varlık datasını yüklerken hata oldu src/app/components/assets/assets.component.html - 48,53 + 50,55 Asset data load error @@ -2030,7 +2044,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2047,7 +2061,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 161 + 165 @@ -2063,7 +2077,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 163 + 167 @@ -2075,11 +2089,11 @@ src/app/components/block-fees-graph/block-fees-graph.component.ts - 62 + 67 src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2088,19 +2102,19 @@ Bloklar İndeksleniyor src/app/components/block-fees-graph/block-fees-graph.component.ts - 110,105 + 116,111 src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 108,103 + 113,108 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 115,110 + 116,111 src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2121,6 +2135,7 @@ not available + Müsait değil src/app/components/block-overview-graph/block-overview-graph.component.html 5 @@ -2140,7 +2155,7 @@ src/app/components/transaction/transaction.component.html - 476 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2166,11 +2181,11 @@ src/app/components/transaction/transaction.component.html - 476,477 + 473 src/app/components/transactions-list/transactions-list.component.html - 286,287 + 288 sat shared.sat @@ -2184,11 +2199,11 @@ src/app/components/transaction/transaction.component.html - 161,165 + 155,159 src/app/components/transaction/transaction.component.html - 479,481 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2200,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 38,39 + 41,43 Transaction fee rate transaction.fee-rate @@ -2218,19 +2233,19 @@ src/app/components/block/block.component.html - 125,128 + 124,127 src/app/components/block/block.component.html - 129 + 128,130 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 12,14 + 19,22 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 15,17 + 30,33 src/app/components/fees-box/fees-box.component.html @@ -2270,27 +2285,27 @@ src/app/components/transaction/transaction.component.html - 173,174 + 167,168 src/app/components/transaction/transaction.component.html - 184,185 + 178,179 src/app/components/transaction/transaction.component.html - 195,196 + 189,190 src/app/components/transaction/transaction.component.html - 481,484 + 478,481 src/app/components/transaction/transaction.component.html - 492,494 + 489,491 src/app/components/transactions-list/transactions-list.component.html - 286 + 286,287 src/app/dashboard/dashboard.component.html @@ -2298,7 +2313,7 @@ src/app/dashboard/dashboard.component.html - 204,208 + 213,217 sat/vB shared.sat-vbyte @@ -2312,17 +2327,18 @@ src/app/components/transaction/transaction.component.html - 160,162 + 154,156 src/app/components/transaction/transaction.component.html - 274,277 + 269,272 Transaction Virtual Size transaction.vsize Audit status + Denetlenme durumu src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 36 @@ -2331,6 +2347,7 @@ Match + Eşleşti src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 38 @@ -2339,6 +2356,7 @@ Removed + Kaldırıldı src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 39 @@ -2347,6 +2365,7 @@ Marginal fee rate + Marjinal Ücret Değeri src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 40 @@ -2359,6 +2378,7 @@ Recently broadcasted + Yakın zamanda yayınlanan src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 41 @@ -2387,7 +2407,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2424,11 +2444,11 @@ src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 60 + 65 src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2445,7 +2465,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2454,15 +2474,15 @@ Boyut src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 180,179 + 184,183 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 226,224 + 239,237 src/app/components/block/block.component.html - 50,52 + 48,50 src/app/components/blocks-list/blocks-list.component.html @@ -2486,7 +2506,7 @@ src/app/components/transaction/transaction.component.html - 270,272 + 265,267 src/app/dashboard/dashboard.component.html @@ -2498,11 +2518,11 @@ Ağırlık src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 188,187 + 192,191 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 257,254 + 270,267 src/app/components/block/block-preview.component.html @@ -2510,11 +2530,23 @@ src/app/components/block/block.component.html - 54,56 + 52,54 src/app/components/transaction/transaction.component.html - 278,280 + 273,275 + + + + Size per weight + Ağırlık başına düşen boyut + + src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts + 200,199 + + + src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts + 282,279 @@ -2530,15 +2562,6 @@ shared.block-title - - - - - src/app/components/block/block-preview.component.html - 11,12 - - shared.block-title - Median fee Medyan ücret @@ -2548,7 +2571,7 @@ src/app/components/block/block.component.html - 128,129 + 127,128 src/app/components/mempool-block/mempool-block.component.html @@ -2565,11 +2588,11 @@ src/app/components/block/block.component.html - 133,135 + 138,140 src/app/components/block/block.component.html - 159,162 + 164,167 src/app/components/mempool-block/mempool-block.component.html @@ -2587,7 +2610,7 @@ src/app/components/block/block.component.html - 168,170 + 173,175 block.miner @@ -2600,7 +2623,7 @@ src/app/components/block/block.component.ts - 227 + 242 @@ -2610,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2625,32 +2652,49 @@ Previous Block - - Block health + + Health + Sağlık src/app/components/block/block.component.html - 58,61 + 56 - block.health + + src/app/components/blocks-list/blocks-list.component.html + 18,19 + + + src/app/components/blocks-list/blocks-list.component.html + 18,19 + + latest-blocks.health Unknown Bilinmiyor src/app/components/block/block.component.html - 69,72 + 67,70 src/app/components/blocks-list/blocks-list.component.html 60,63 - src/app/lightning/node/node.component.html - 52,55 + src/app/components/pool-ranking/pool-ranking.component.html + 121,124 + + + src/app/lightning/channel/closing-type/closing-type.component.ts + 32 src/app/lightning/node/node.component.html - 96,100 + 55,58 + + + src/app/lightning/node/node.component.html + 99,103 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts @@ -2667,7 +2711,7 @@ Ücret aralığı src/app/components/block/block.component.html - 124,125 + 123,124 src/app/components/mempool-block/mempool-block.component.html @@ -2680,7 +2724,7 @@ 140 vbytelık ortalama native segwit ücreti baz alınmıştır src/app/components/block/block.component.html - 129,131 + 131,136 src/app/components/fees-box/fees-box.component.html @@ -2704,49 +2748,66 @@ Transaction fee tooltip - - Subsidy + fees: - Ödül + ücretler: + + Subsidy + fees + Ödül + ücretler src/app/components/block/block.component.html - 148,151 + 153,156 src/app/components/block/block.component.html - 163,167 + 168,172 Total subsidy and fees in a block block.subsidy-and-fees - - Projected + + Expected + Beklenen src/app/components/block/block.component.html - 210,212 + 216 - block.projected + block.expected + + + beta + beta + + src/app/components/block/block.component.html + 216,217 + + + src/app/components/block/block.component.html + 222,224 + + beta Actual + Aktüel src/app/components/block/block.component.html - 212,216 + 218,222 block.actual - - Projected Block + + Expected Block + Beklenen blok src/app/components/block/block.component.html - 216,218 + 222 - block.projected-block + block.expected-block Actual Block + Gerçekleşen blok src/app/components/block/block.component.html - 225,227 + 231 block.actual-block @@ -2755,7 +2816,7 @@ Bit src/app/components/block/block.component.html - 250,252 + 256,258 block.bits @@ -2764,7 +2825,7 @@ Merkle kökü src/app/components/block/block.component.html - 254,256 + 260,262 block.merkle-root @@ -2773,7 +2834,7 @@ Zorluk src/app/components/block/block.component.html - 265,268 + 271,274 src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html @@ -2789,11 +2850,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2802,7 +2863,7 @@ Nonce src/app/components/block/block.component.html - 269,271 + 275,277 block.nonce @@ -2811,32 +2872,42 @@ Block Başlığı Hex'i src/app/components/block/block.component.html - 273,274 + 279,280 block.header + + Audit + Denetleme + + src/app/components/block/block.component.html + 297,301 + + Toggle Audit + block.toggle-audit + Details Detaylar src/app/components/block/block.component.html - 284,288 + 304,308 src/app/components/transaction/transaction.component.html - 254,259 + 249,254 src/app/lightning/channel/channel.component.html - 86,88 + 93,95 src/app/lightning/channel/channel.component.html - 96,98 + 103,105 src/app/lightning/node/node.component.html - 218,222 + 221,225 Transaction Details transaction.details @@ -2846,20 +2917,16 @@ Veriyi yüklerken hata oluştu src/app/components/block/block.component.html - 303,305 + 323,325 src/app/components/block/block.component.html - 339,343 + 362,366 src/app/lightning/channel/channel-preview.component.html 70,75 - - src/app/lightning/channel/channel.component.html - 109,115 - src/app/lightning/node/node-preview.component.html 66,69 @@ -2872,9 +2939,10 @@ Why is this block empty? + Blok neden boş? src/app/components/block/block.component.html - 361,367 + 384,390 block.empty-block-explanation @@ -2920,18 +2988,6 @@ latest-blocks.mined - - Health - - src/app/components/blocks-list/blocks-list.component.html - 18,19 - - - src/app/components/blocks-list/blocks-list.component.html - 18,19 - - latest-blocks.health - Reward Ödüller @@ -2995,7 +3051,7 @@ src/app/dashboard/dashboard.component.html - 210,214 + 219,223 dashboard.txs @@ -3028,13 +3084,17 @@ Difficulty Adjustment Zorluk Seviyesi + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3042,11 +3102,11 @@ Remaining Kalan - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3055,11 +3115,11 @@ blocks bloklar - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3080,11 +3140,11 @@ block blok - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3097,11 +3157,11 @@ Estimate Tahmini - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3110,20 +3170,24 @@ Previous Önceki - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Şimdiki periyod - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3132,11 +3196,99 @@ Next Halving Bir Sonraki Yarılanma Dönemi - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) Minimum önceliğin 2x katı ya da minimum işlem önceliği (hangisi daha düşük ise) @@ -3234,7 +3386,7 @@ src/app/dashboard/dashboard.component.html - 237,238 + 246,247 dashboard.incoming-transactions @@ -3247,7 +3399,7 @@ src/app/dashboard/dashboard.component.html - 240,243 + 249,252 dashboard.backend-is-synchronizing @@ -3260,7 +3412,7 @@ src/app/dashboard/dashboard.component.html - 245,250 + 254,259 vB/s shared.vbytes-per-second @@ -3274,7 +3426,7 @@ src/app/dashboard/dashboard.component.html - 208,209 + 217,218 Unconfirmed count dashboard.unconfirmed @@ -3294,7 +3446,7 @@ Madencilik src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3303,7 +3455,7 @@ Havuz Sıralaması src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3316,7 +3468,7 @@ Havuz Dominansı src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3329,7 +3481,7 @@ Hash gücü & Zorluk src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3338,7 +3490,7 @@ Lightning src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3347,7 +3499,7 @@ Ağ başına düşen Lightning Node'u src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3368,7 +3520,7 @@ Lightning ağı kapasitesi src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3389,7 +3541,7 @@ ISP başına düşen Lightning Node'u src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3402,7 +3554,7 @@ Ülkelere göre Lightning Node'ları src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3419,7 +3571,7 @@ Lightning Node'u Dünya Haritası src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3436,7 +3588,7 @@ Lightning Kanalları Dünya Haritası src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3457,11 +3609,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3491,11 +3643,11 @@ Hashrate (MA) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3531,7 +3683,7 @@ src/app/components/master-page/master-page.component.html - 52,54 + 51,53 src/app/components/statistics/statistics.component.ts @@ -3557,7 +3709,7 @@ Lightning tarayıcı src/app/components/master-page/master-page.component.html - 44,45 + 44,47 src/app/lightning/lightning-dashboard/lightning-dashboard.component.ts @@ -3565,21 +3717,12 @@ master-page.lightning - - beta - beta - - src/app/components/master-page/master-page.component.html - 45,48 - - beta - Documentation Dökümentasyon src/app/components/master-page/master-page.component.html - 55,57 + 54,56 src/app/docs/docs/docs.component.html @@ -3624,7 +3767,7 @@ Ödül İstatistikleri src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3633,7 +3776,7 @@ (144 blok) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3642,7 +3785,7 @@ Son bloklar src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3655,10 +3798,36 @@ Düzenlemeler src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments + + Broadcast Transaction + İşlemi Ağa Sal + + src/app/components/mining-dashboard/mining-dashboard.component.html + 91 + + + src/app/components/push-transaction/push-transaction.component.html + 2 + + + src/app/components/push-transaction/push-transaction.component.html + 8 + + + src/app/dashboard/dashboard.component.html + 161,169 + + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 102 + + Broadcast Transaction + shared.broadcast-transaction + Pools luck (1 week) Havuz Şansı (1 hafta) @@ -3726,7 +3895,7 @@ src/app/components/pool-ranking/pool-ranking.component.html - 136,138 + 152,154 master-page.blocks @@ -3756,12 +3925,25 @@ mining.rank + + Avg Health + Ortalama sağlık + + src/app/components/pool-ranking/pool-ranking.component.html + 96,97 + + + src/app/components/pool-ranking/pool-ranking.component.html + 96,98 + + latest-blocks.avg_health + Empty blocks Boş Bloklar src/app/components/pool-ranking/pool-ranking.component.html - 95,98 + 97,100 mining.empty-blocks @@ -3770,7 +3952,7 @@ Tüm madenciler src/app/components/pool-ranking/pool-ranking.component.html - 113,114 + 129,130 mining.all-miners @@ -3779,7 +3961,7 @@ Havuzun Talihi (1h) src/app/components/pool-ranking/pool-ranking.component.html - 130,132 + 146,148 mining.miners-luck @@ -3788,7 +3970,7 @@ Toplam Havuzlar (1h) src/app/components/pool-ranking/pool-ranking.component.html - 142,144 + 158,160 mining.miners-count @@ -3797,12 +3979,11 @@ Madenci Havuzları src/app/components/pool-ranking/pool-ranking.component.ts - 57 + 58 - - blocks - blok + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3811,6 +3992,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4024,24 +4240,6 @@ latest-blocks.coinbasetag - - Broadcast Transaction - İşlemi Ağa Sal - - src/app/components/push-transaction/push-transaction.component.html - 2 - - - src/app/components/push-transaction/push-transaction.component.html - 8 - - - src/app/dashboard/dashboard.component.html - 154,161 - - Broadcast Transaction - shared.broadcast-transaction - Transaction hex Hex İşlem @@ -4051,7 +4249,7 @@ src/app/components/transaction/transaction.component.html - 296,297 + 291,292 transaction.hex @@ -4083,6 +4281,7 @@ Avg Block Fees + Ortalama Blok Ücreti src/app/components/reward-stats/reward-stats.component.html 17 @@ -4095,6 +4294,7 @@ Average fees per block in the past 144 blocks + Son 144 blok için ortalama ücret src/app/components/reward-stats/reward-stats.component.html 18,20 @@ -4103,6 +4303,7 @@ BTC/block + BTC/blok src/app/components/reward-stats/reward-stats.component.html 21,24 @@ -4112,6 +4313,7 @@ Avg Tx Fee + Ortalama gönderi ücreti src/app/components/reward-stats/reward-stats.component.html 30 @@ -4172,6 +4374,78 @@ search-form.search-title + + Bitcoin Block Height + Bitcoin Blok Yüksekliği + + src/app/components/search-form/search-results/search-results.component.html + 3 + + search.bitcoin-block-height + + + Bitcoin Transaction + Bitcoin İşlemi + + src/app/components/search-form/search-results/search-results.component.html + 9 + + search.bitcoin-transaction + + + Bitcoin Address + Bitcoin Adresi + + src/app/components/search-form/search-results/search-results.component.html + 15 + + search.bitcoin-address + + + Bitcoin Block + Bitcoin bloğu + + src/app/components/search-form/search-results/search-results.component.html + 21 + + search.bitcoin-block + + + Bitcoin Addresses + Bitcoin adresleri + + src/app/components/search-form/search-results/search-results.component.html + 27 + + search.bitcoin-addresses + + + Lightning Nodes + Lightning düğümleri + + src/app/components/search-form/search-results/search-results.component.html + 35 + + search.lightning-nodes + + + Lightning Channels + Lightning kanalları + + src/app/components/search-form/search-results/search-results.component.html + 43 + + search.lightning-channels + + + Go to "" + "" 'a git; + + src/app/components/search-form/search-results/search-results.component.html + 52 + + search.go-to + Mempool by vBytes (sat/vByte) Mempool vByte (sat/vByte) görünümü @@ -4199,7 +4473,7 @@ Filtre src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4208,7 +4482,7 @@ Ters çevir src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4217,7 +4491,7 @@ Saniye başı vBytes (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4225,196 +4499,188 @@ Just now Az önce - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago önce - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + Yaklaşık + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After sonrası - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - Yaklaşık ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4429,6 +4695,7 @@ This transaction replaced: + Bu işlem değiştirildi: src/app/components/transaction/transaction.component.html 10,12 @@ -4438,6 +4705,7 @@ Replaced + Değiştirildi src/app/components/transaction/transaction.component.html 36,39 @@ -4454,7 +4722,7 @@ src/app/components/transactions-list/transactions-list.component.html - 298,301 + 300,303 Transaction unconfirmed state transaction.unconfirmed @@ -4464,11 +4732,11 @@ İlk görüldüğü an src/app/components/transaction/transaction.component.html - 108,109 + 102,103 src/app/lightning/node/node.component.html - 67,70 + 70,73 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -4484,11 +4752,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 13,15 + 15,16 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 13,15 + 15,16 Transaction first seen transaction.first-seen @@ -4498,7 +4766,7 @@ Tahmini Varış Süresi src/app/components/transaction/transaction.component.html - 115,116 + 109,110 Transaction ETA transaction.eta @@ -4508,7 +4776,7 @@ Bir kaç saat içinde (veya daha sonra) src/app/components/transaction/transaction.component.html - 121,124 + 115,118 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -4518,11 +4786,11 @@ Azalan src/app/components/transaction/transaction.component.html - 168,170 + 162,164 src/app/components/transaction/transaction.component.html - 179,181 + 173,175 Descendant transaction.descendant @@ -4532,7 +4800,7 @@ Ata src/app/components/transaction/transaction.component.html - 190,192 + 184,186 Transaction Ancestor transaction.ancestor @@ -4542,11 +4810,11 @@ Akış src/app/components/transaction/transaction.component.html - 208,211 + 202,205 src/app/components/transaction/transaction.component.html - 346,350 + 341,345 Transaction flow transaction.flow @@ -4556,7 +4824,7 @@ Diyagramı kapat src/app/components/transaction/transaction.component.html - 211,216 + 205,210 hide-diagram @@ -4565,7 +4833,7 @@ Daha fazla göster src/app/components/transaction/transaction.component.html - 231,233 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4582,7 +4850,7 @@ Daha az göster src/app/components/transaction/transaction.component.html - 233,239 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4595,7 +4863,7 @@ Diyagramı göster src/app/components/transaction/transaction.component.html - 253,254 + 248,249 show-diagram @@ -4604,7 +4872,7 @@ Kilit Süresi src/app/components/transaction/transaction.component.html - 292,294 + 287,289 transaction.locktime @@ -4613,7 +4881,7 @@ İşlem bulunamadı. src/app/components/transaction/transaction.component.html - 455,456 + 450,451 transaction.error.transaction-not-found @@ -4622,7 +4890,7 @@ Mempool'a dahil olmayı bekliyor. src/app/components/transaction/transaction.component.html - 456,461 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4631,7 +4899,7 @@ Efektiv işlem ücreti oranı src/app/components/transaction/transaction.component.html - 489,492 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -4777,17 +5045,19 @@ Show more inputs to reveal fee data + Ücret datasının için daha çok girdi göster src/app/components/transactions-list/transactions-list.component.html - 288,291 + 290,293 transactions-list.load-to-reveal-fee-info remaining + Kalan src/app/components/transactions-list/transactions-list.component.html - 330,331 + 332,333 x-remaining @@ -4935,6 +5205,7 @@ This transaction does not use Taproot + Bu işlem Taproot kullanmıyor src/app/components/tx-features/tx-features.component.html 18 @@ -5037,21 +5308,12 @@ dashboard.latest-transactions - - USD - USD - - src/app/dashboard/dashboard.component.html - 126,127 - - dashboard.latest-transactions.USD - Minimum fee Minimum ücret src/app/dashboard/dashboard.component.html - 201,202 + 210,211 Minimum mempool fee dashboard.minimum-fee @@ -5061,7 +5323,7 @@ Temizleme src/app/dashboard/dashboard.component.html - 202,203 + 211,212 Purgin below fee dashboard.purging @@ -5071,7 +5333,7 @@ Hafıza kullanımı src/app/dashboard/dashboard.component.html - 214,215 + 223,224 Memory usage dashboard.memory-usage @@ -5081,16 +5343,29 @@ Dolaşımdaki L-BTC miktarı src/app/dashboard/dashboard.component.html - 228,230 + 237,239 dashboard.lbtc-pegs-in-circulation + + mempool.space merely provides data about the Bitcoin network. It cannot help you with retrieving funds, confirming your transaction quicker, etc. + mempool.space sadece Bitcoin ağı ile ilgili bilgi sağlar. Kayıp gönderilerinize ulaşmanız veya işlemleri hızlandırmanız gibi istekleriniz için size çözüm sağlayamaz. + + src/app/docs/api-docs/api-docs.component.html + 13 + + + src/app/docs/api-docs/api-docs.component.html + 14 + + faq.big-disclaimer + REST API service REST API servisi src/app/docs/api-docs/api-docs.component.html - 39,40 + 42,43 api-docs.title @@ -5099,11 +5374,11 @@ Çıkış Noktası src/app/docs/api-docs/api-docs.component.html - 48,49 + 51,52 src/app/docs/api-docs/api-docs.component.html - 102,105 + 105,108 Api docs endpoint @@ -5112,11 +5387,11 @@ Tanım src/app/docs/api-docs/api-docs.component.html - 67,68 + 70,71 src/app/docs/api-docs/api-docs.component.html - 106,107 + 109,110 @@ -5124,7 +5399,7 @@ Varsayılan ileti: action: 'want', data: ['blocks', ...] iletmek istediğini belirt. Kullanılabilir alanlar: blocks, mempool-blocks, live-2h-chart ve stats. Takip eden adresle ilişkili işlemleri ileterek: 'track-address': '3PbJ...bF9B' bu adresi içeren bütün giriş ve çıkış işlemlerini al. İşlemleri sırala. Yeni mempool işlemleri içinaddress-transactions ve yeni onaylı blok işlemleri için block-transcations kullan. src/app/docs/api-docs/api-docs.component.html - 107,108 + 110,111 api-docs.websocket.websocket @@ -5221,7 +5496,7 @@ src/app/lightning/node/node.component.html - 180,182 + 183,185 shared.m-sats @@ -5297,12 +5572,17 @@ src/app/lightning/channels-list/channels-list.component.html - 120,121 + 123,124 + + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 lightning.x-channels Starting balance + Başlangıç balansı src/app/lightning/channel/channel-close-box/channel-close-box.component.html 6 @@ -5312,6 +5592,7 @@ Closing balance + Kapanış balansı src/app/lightning/channel/channel-close-box/channel-close-box.component.html 12 @@ -5337,11 +5618,11 @@ src/app/lightning/channel/channel.component.html - 11,12 + 13,14 src/app/lightning/channels-list/channels-list.component.html - 65,66 + 68,69 status.inactive @@ -5354,11 +5635,11 @@ src/app/lightning/channel/channel.component.html - 12,13 + 14,15 src/app/lightning/channels-list/channels-list.component.html - 66,68 + 69,71 status.active @@ -5371,7 +5652,7 @@ src/app/lightning/channel/channel.component.html - 13,14 + 15,16 src/app/lightning/channels-list/channels-list.component.html @@ -5379,7 +5660,7 @@ src/app/lightning/channels-list/channels-list.component.html - 68,70 + 71,73 status.closed @@ -5392,7 +5673,7 @@ src/app/lightning/channel/channel.component.html - 29,30 + 36,37 lightning.created @@ -5405,11 +5686,19 @@ src/app/lightning/channel/channel.component.html - 48,49 + 55,56 src/app/lightning/channels-list/channels-list.component.html - 40,43 + 43,46 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 src/app/lightning/node-statistics/node-statistics.component.html @@ -5417,7 +5706,7 @@ src/app/lightning/node-statistics/node-statistics.component.html - 47,50 + 46,49 src/app/lightning/nodes-list/nodes-list.component.html @@ -5439,6 +5728,10 @@ src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 60,62 + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 13,14 + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 202,201 @@ -5475,11 +5768,11 @@ Lightning kanalı src/app/lightning/channel/channel.component.html - 2,5 + 4,7 src/app/lightning/channel/channel.component.html - 117,119 + 116,118 lightning.channel @@ -5488,11 +5781,11 @@ Son güncelleme src/app/lightning/channel/channel.component.html - 33,34 + 40,41 src/app/lightning/node/node.component.html - 73,75 + 76,78 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5508,11 +5801,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 14,15 + 16,17 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 14,15 + 16,17 lightning.last-update @@ -5521,19 +5814,20 @@ Kapanış tarihi src/app/lightning/channel/channel.component.html - 37,38 + 44,45 src/app/lightning/channels-list/channels-list.component.html - 39,40 + 42,44 lightning.closing_date Closed by + Kapayan src/app/lightning/channel/channel.component.html - 52,54 + 59,61 lightning.closed_by @@ -5542,7 +5836,7 @@ Açılış işlemi src/app/lightning/channel/channel.component.html - 84,85 + 91,92 lightning.opening-transaction @@ -5551,7 +5845,7 @@ Kapanış işlemi src/app/lightning/channel/channel.component.html - 93,95 + 100,102 lightning.closing-transaction @@ -5563,6 +5857,30 @@ 37 + + Mutually closed + Ortaklaşa kapatıldı + + src/app/lightning/channel/closing-type/closing-type.component.ts + 20 + + + + Force closed + Kapanmaya zorlandı + + src/app/lightning/channel/closing-type/closing-type.component.ts + 24 + + + + Force closed with penalty + Ceza ödeyerek zorla kapatıldı + + src/app/lightning/channel/closing-type/closing-type.component.ts + 28 + + Open Açık @@ -5577,7 +5895,7 @@ Gösterilecek kanal bulunamadı src/app/lightning/channels-list/channels-list.component.html - 29,35 + 29,37 lightning.empty-channels-list @@ -5586,7 +5904,7 @@ Takma ad src/app/lightning/channels-list/channels-list.component.html - 35,37 + 38,40 src/app/lightning/group/group.component.html @@ -5610,11 +5928,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 10,11 + 11,12 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 10,12 + 11,13 lightning.alias @@ -5623,7 +5941,7 @@ Durum src/app/lightning/channels-list/channels-list.component.html - 37,38 + 40,41 status @@ -5632,7 +5950,7 @@ Kanal ID src/app/lightning/channels-list/channels-list.component.html - 41,45 + 44,48 channels.id @@ -5641,11 +5959,11 @@ sats src/app/lightning/channels-list/channels-list.component.html - 60,64 + 63,68 src/app/lightning/channels-list/channels-list.component.html - 84,88 + 87,91 src/app/lightning/channels-statistics/channels-statistics.component.html @@ -5689,6 +6007,24 @@ shared.sats + + avg + ortalama + + src/app/lightning/channels-statistics/channels-statistics.component.html + 3,5 + + statistics.average-small + + + med + orta + + src/app/lightning/channels-statistics/channels-statistics.component.html + 6,9 + + statistics.median-small + Avg Capacity Ortalama Kapasite @@ -5817,11 +6153,11 @@ src/app/lightning/node-statistics/node-statistics.component.html - 17,18 + 16,17 src/app/lightning/node-statistics/node-statistics.component.html - 54,57 + 53,56 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -5870,10 +6206,6 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 11,12 - - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html 12,13 lightning.liquidity @@ -5890,12 +6222,20 @@ 40,44 - src/app/lightning/node-statistics/node-statistics.component.html - 29,30 + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 src/app/lightning/node-statistics/node-statistics.component.html - 61,64 + 28,29 + + + src/app/lightning/node-statistics/node-statistics.component.html + 60,63 src/app/lightning/nodes-list/nodes-list.component.html @@ -5927,16 +6267,20 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 12,13 + 14,15 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 11,12 + 12,13 src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -5969,7 +6313,7 @@ src/app/lightning/node/node.component.html - 47,49 + 50,52 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5985,11 +6329,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 15,17 + 17,20 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 15,17 + 17,20 lightning.location @@ -6027,9 +6371,17 @@ src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 62 + + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html + 4,9 + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.ts - 29 + 33 + + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 4,9 src/app/lightning/nodes-rankings-dashboard/nodes-rankings-dashboard.component.html @@ -6052,12 +6404,37 @@ Fee distribution + Ücret dağılımı src/app/lightning/node-fee-chart/node-fee-chart.component.html 2 lightning.node-fee-distribution + + Outgoing Fees + Giden ücretler + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 170 + + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 208 + + + + Incoming Fees + Gelen ücretler + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 178 + + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 222 + + Percentage change past week Geçen haftaya göre yüzdelik değişim @@ -6067,11 +6444,11 @@ src/app/lightning/node-statistics/node-statistics.component.html - 18,20 + 17,19 src/app/lightning/node-statistics/node-statistics.component.html - 30,32 + 29,31 mining.percentage-change-last-week @@ -6084,11 +6461,11 @@ src/app/lightning/node/node.component.html - 2,4 + 4,6 src/app/lightning/node/node.component.html - 260,262 + 263,265 lightning.node @@ -6101,7 +6478,7 @@ src/app/lightning/node/node.component.html - 27,30 + 30,33 lightning.active-capacity @@ -6114,7 +6491,7 @@ src/app/lightning/node/node.component.html - 34,38 + 37,41 lightning.active-channels @@ -6127,29 +6504,21 @@ country - - No node found for public key "" - &quot;&quot; halka açık anahtar için Node bulunamadı - - src/app/lightning/node/node.component.html - 17,19 - - lightning.node-not-found - Average channel size Ortalama kanal büyüklüğü src/app/lightning/node/node.component.html - 40,43 + 43,46 lightning.active-channels-avg Avg channel distance + Ortalama kanal uzaklığı src/app/lightning/node/node.component.html - 56,57 + 59,60 lightning.avg-distance @@ -6158,7 +6527,7 @@ Renk src/app/lightning/node/node.component.html - 79,81 + 82,84 lightning.color @@ -6167,7 +6536,7 @@ ISP src/app/lightning/node/node.component.html - 86,87 + 89,90 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html @@ -6180,73 +6549,81 @@ Sadece Tor üzerinde src/app/lightning/node/node.component.html - 93,95 + 96,98 tor Liquidity ad + Likidite reklamı src/app/lightning/node/node.component.html - 138,141 + 141,144 node.liquidity-ad Lease fee rate + Kiralama ücreti src/app/lightning/node/node.component.html - 144,147 + 147,150 Liquidity ad lease fee rate liquidity-ad.lease-fee-rate Lease base fee + Kiralama için baz ücret src/app/lightning/node/node.component.html - 152,154 + 155,157 liquidity-ad.lease-base-fee Funding weight + Fonlama ağırlığı src/app/lightning/node/node.component.html - 158,159 + 161,162 liquidity-ad.funding-weight Channel fee rate + Kanal ücreti src/app/lightning/node/node.component.html - 168,171 + 171,174 Liquidity ad channel fee rate liquidity-ad.channel-fee-rate Channel base fee + Kanal baz ücreti src/app/lightning/node/node.component.html - 176,178 + 179,181 liquidity-ad.channel-base-fee Compact lease + Kompakt kiralama src/app/lightning/node/node.component.html - 188,190 + 191,193 liquidity-ad.compact-lease TLV extension records + TLV uzatma kayıtları src/app/lightning/node/node.component.html - 199,202 + 202,205 node.tlv.records @@ -6255,7 +6632,7 @@ Açık kanallar src/app/lightning/node/node.component.html - 240,243 + 243,246 lightning.open-channels @@ -6264,7 +6641,7 @@ Kapanan kanallar src/app/lightning/node/node.component.html - 244,247 + 247,250 lightning.open-channels @@ -6310,7 +6687,7 @@ Geolokasyon datasına ulaşılamıyor src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts - 218,213 + 219,214 @@ -6324,6 +6701,7 @@ Indexing in progress + İndeksleniyor src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 121,116 @@ -6333,9 +6711,9 @@ 112,107 - - Reachable on Clearnet Only - Sadece clearnet üzerinden ulaşılanlar + + Clearnet and Darknet + Şeffaf İnternet ve Darknet src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -6345,9 +6723,9 @@ 303,302 - - Reachable on Clearnet and Darknet - Clearnet ve Tor üzerinden ulaşılanlar + + Clearnet Only (IPv4, IPv6) + Sadece Şeffaf İnternet (IPV4, IPV6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -6357,9 +6735,9 @@ 295,294 - - Reachable on Darknet Only - Sadece Tor üzerinden ulaşılanlar + + Darknet Only (Tor, I2P, cjdns) + Sadece Darknet (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -6383,19 +6761,22 @@ lightning.share - nodes - Node'lar + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6403,7 +6784,7 @@ BTC kapasite src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6521,11 +6902,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 @@ -6591,6 +6972,7 @@ Active nodes + Aktif düğümler src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 14,18 @@ -6614,24 +6996,6 @@ 27 - - Top 100 nodes liquidity ranking - Likidite sıralamasına göre en iyi 100 Node - - src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 3,7 - - lightning.top-100-liquidity - - - Top 100 nodes connectivity ranking - Bağlantı sıralamasına göre en iyi 100 Node - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 3,7 - - lightning.top-100-connectivity - Oldest nodes En eski Node'lar diff --git a/frontend/src/locale/messages.uk.xlf b/frontend/src/locale/messages.uk.xlf index 0404aee6e..5794afcc5 100644 --- a/frontend/src/locale/messages.uk.xlf +++ b/frontend/src/locale/messages.uk.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1074,7 +1074,7 @@ src/app/components/transaction/transaction.component.html - 282,284 + 283,285 transaction.version @@ -1202,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 256,261 + 257,262 src/app/components/transaction/transaction.component.html - 400,406 + 401,407 transaction.details @@ -1223,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 243,247 + 244,248 src/app/components/transaction/transaction.component.html - 371,377 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1245,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 244,243 + 246,245 @@ -1487,7 +1487,7 @@ Союзи спільноти src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Перекладачі проекту src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Учасники проекту src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Члени проекту src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Розробники проекту src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -1581,7 +1581,7 @@ src/app/components/amount/amount.component.html - 20,23 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -2044,7 +2044,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2093,7 +2093,7 @@ src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2114,7 +2114,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2155,7 +2155,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2181,7 +2181,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/transactions-list/transactions-list.component.html @@ -2203,7 +2203,7 @@ src/app/components/transaction/transaction.component.html - 475,477 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2297,11 +2297,11 @@ src/app/components/transaction/transaction.component.html - 477,480 + 478,481 src/app/components/transaction/transaction.component.html - 488,490 + 489,491 src/app/components/transactions-list/transactions-list.component.html @@ -2331,7 +2331,7 @@ src/app/components/transaction/transaction.component.html - 268,271 + 269,272 Transaction Virtual Size transaction.vsize @@ -2407,7 +2407,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2448,7 +2448,7 @@ src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2465,7 +2465,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2506,7 +2506,7 @@ src/app/components/transaction/transaction.component.html - 264,266 + 265,267 src/app/dashboard/dashboard.component.html @@ -2534,7 +2534,7 @@ src/app/components/transaction/transaction.component.html - 272,274 + 273,275 @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2846,11 +2850,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2891,7 +2895,7 @@ src/app/components/transaction/transaction.component.html - 248,253 + 249,254 src/app/lightning/channel/channel.component.html @@ -3080,13 +3084,17 @@ Difficulty Adjustment Регулювання складності + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3094,11 +3102,11 @@ Remaining Лишається - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3115,11 @@ blocks блоків - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3132,11 +3140,11 @@ block блок - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3149,11 +3157,11 @@ Estimate Приблизно - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3162,20 +3170,24 @@ Previous Попередня - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Поточний період - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3184,11 +3196,99 @@ Next Halving Наступне зменшення винагороди - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) Або 2x мініуму, або повільна ставка (що менше) @@ -3346,7 +3446,7 @@ Майнінг src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3355,7 +3455,7 @@ Рейтинг пулів src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3368,7 +3468,7 @@ Домінування пулу src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3381,7 +3481,7 @@ Хешрейт та складність src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3390,7 +3490,7 @@ Lightning src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3399,7 +3499,7 @@ Lightning нод на мережу src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3420,7 +3520,7 @@ Пропускна спроможність Lightning src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3441,7 +3541,7 @@ Lightning нод на ISP src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3454,7 +3554,7 @@ Lightning нод на країну src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3471,7 +3571,7 @@ Мапа Lightning нод src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3488,7 +3588,7 @@ Мапа Lightning каналів src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3509,11 +3609,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3543,11 +3643,11 @@ Хешрейт (MA) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3667,7 +3767,7 @@ Статистика нагороди src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3676,7 +3776,7 @@ (144 блоки) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3685,7 +3785,7 @@ Останні блоки src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3698,7 +3798,7 @@ Регулювання src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3707,7 +3807,7 @@ Надіслати транзакцію src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3882,9 +3982,8 @@ 58 - - blocks - блоків + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3893,6 +3992,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4115,7 +4249,7 @@ src/app/components/transaction/transaction.component.html - 290,291 + 291,292 transaction.hex @@ -4339,7 +4473,7 @@ Фільтрувати src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4348,7 +4482,7 @@ Інвертувати src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4357,7 +4491,7 @@ vBytes за секунду транзакції (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4365,196 +4499,187 @@ Just now Щойно - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago тому - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After Після - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - Через ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4688,7 +4813,7 @@ src/app/components/transaction/transaction.component.html - 340,344 + 341,345 Transaction flow transaction.flow @@ -4707,7 +4832,7 @@ Показати більше src/app/components/transaction/transaction.component.html - 225,227 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4724,7 +4849,7 @@ Показати менше src/app/components/transaction/transaction.component.html - 227,233 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4737,7 +4862,7 @@ Показати діаграму src/app/components/transaction/transaction.component.html - 247,248 + 248,249 show-diagram @@ -4746,7 +4871,7 @@ Час блокування src/app/components/transaction/transaction.component.html - 286,288 + 287,289 transaction.locktime @@ -4755,7 +4880,7 @@ Транзакція не знайдена. src/app/components/transaction/transaction.component.html - 449,450 + 450,451 transaction.error.transaction-not-found @@ -4764,7 +4889,7 @@ Чекаємо її появи в мемпулі... src/app/components/transaction/transaction.component.html - 450,455 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4773,7 +4898,7 @@ Поточна ставка комісії src/app/components/transaction/transaction.component.html - 485,488 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -5228,6 +5353,10 @@ src/app/docs/api-docs/api-docs.component.html 13 + + src/app/docs/api-docs/api-docs.component.html + 14 + faq.big-disclaimer @@ -5235,7 +5364,7 @@ Сервіс REST API src/app/docs/api-docs/api-docs.component.html - 41,42 + 42,43 api-docs.title @@ -5244,11 +5373,11 @@ Ендпоїнт src/app/docs/api-docs/api-docs.component.html - 50,51 + 51,52 src/app/docs/api-docs/api-docs.component.html - 104,107 + 105,108 Api docs endpoint @@ -5257,11 +5386,11 @@ Опис src/app/docs/api-docs/api-docs.component.html - 69,70 + 70,71 src/app/docs/api-docs/api-docs.component.html - 108,109 + 109,110 @@ -5269,7 +5398,7 @@ Надсилання за замовчуванням за замовчуванням: action: 'want', data: ['blocks', ...] щоб вказати, що має бути надіслано. Доступно: blocks, mempool-blocks, live-2h-chart та stats.Надіслати транзакції пов'язані з адресою: 'track-address': '3PbJ...bF9B' щоб отримати всі нові транзакції які містять дану адресу у входах чи виходах. Повертає масив транзакцій. address-transactions для нових мемпул транзакцій та block-transactions для нових підтверджених транзакцій. src/app/docs/api-docs/api-docs.component.html - 109,110 + 110,111 api-docs.websocket.websocket @@ -5444,6 +5573,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5558,6 +5691,14 @@ src/app/lightning/channels-list/channels-list.component.html 43,46 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 + src/app/lightning/node-statistics/node-statistics.component.html 4,5 @@ -5676,7 +5817,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5817,7 +5958,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6079,6 +6220,14 @@ src/app/lightning/group/group.component.html 40,44 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 + src/app/lightning/node-statistics/node-statistics.component.html 28,29 @@ -6127,6 +6276,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6604,19 +6757,22 @@ lightning.share - nodes - нод + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6624,7 +6780,7 @@ BTC пропускної спроможності src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6742,11 +6898,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.vi.xlf b/frontend/src/locale/messages.vi.xlf index 3fea854cf..5c4ebe759 100644 --- a/frontend/src/locale/messages.vi.xlf +++ b/frontend/src/locale/messages.vi.xlf @@ -750,11 +750,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -775,11 +775,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -805,7 +805,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1074,7 +1074,7 @@ src/app/components/transaction/transaction.component.html - 282,284 + 283,285 transaction.version @@ -1202,11 +1202,11 @@ src/app/components/transaction/transaction.component.html - 256,261 + 257,262 src/app/components/transaction/transaction.component.html - 400,406 + 401,407 transaction.details @@ -1223,11 +1223,11 @@ src/app/components/transaction/transaction.component.html - 243,247 + 244,248 src/app/components/transaction/transaction.component.html - 371,377 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1245,7 +1245,7 @@ src/app/components/transaction/transaction.component.ts - 244,243 + 246,245 @@ -1487,7 +1487,7 @@ Liên minh cộng đồng src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1496,7 +1496,7 @@ Dịch giả của Dự án src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1505,7 +1505,7 @@ Người đóng góp dự án src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1514,7 +1514,7 @@ Thành viên Dự án src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1523,7 +1523,7 @@ Người bảo trì dự án src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -1581,7 +1581,7 @@ src/app/components/amount/amount.component.html - 20,23 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -2044,7 +2044,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2093,7 +2093,7 @@ src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2114,7 +2114,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2155,7 +2155,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2181,7 +2181,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/transactions-list/transactions-list.component.html @@ -2203,7 +2203,7 @@ src/app/components/transaction/transaction.component.html - 475,477 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2215,7 +2215,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2297,11 +2297,11 @@ src/app/components/transaction/transaction.component.html - 477,480 + 478,481 src/app/components/transaction/transaction.component.html - 488,490 + 489,491 src/app/components/transactions-list/transactions-list.component.html @@ -2331,7 +2331,7 @@ src/app/components/transaction/transaction.component.html - 268,271 + 269,272 Transaction Virtual Size transaction.vsize @@ -2407,7 +2407,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2448,7 +2448,7 @@ src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2465,7 +2465,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2506,7 +2506,7 @@ src/app/components/transaction/transaction.component.html - 264,266 + 265,267 src/app/dashboard/dashboard.component.html @@ -2534,7 +2534,7 @@ src/app/components/transaction/transaction.component.html - 272,274 + 273,275 @@ -2633,6 +2633,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2846,11 +2850,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2891,7 +2895,7 @@ src/app/components/transaction/transaction.component.html - 248,253 + 249,254 src/app/lightning/channel/channel.component.html @@ -3080,13 +3084,17 @@ Difficulty Adjustment Điều chỉnh Độ khó + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3094,11 +3102,11 @@ Remaining Còn lại - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3107,11 +3115,11 @@ blocks khối - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3132,11 +3140,11 @@ block khối - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3149,11 +3157,11 @@ Estimate Ước tính - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3162,20 +3170,24 @@ Previous Trước - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period Giai đoạn hiện tại - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3184,11 +3196,99 @@ Next Halving Halving Tiếp theo - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) Hai lần số lượng tối thiểu hoặc Tỷ lệ ưu tiên thấp (tùy theo tỷ lệ nào thấp hơn) @@ -3346,7 +3446,7 @@ Đào src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3355,7 +3455,7 @@ Xếp hạng pool src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3368,7 +3468,7 @@ Dominance của các Pool src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3381,7 +3481,7 @@ Hashrate & độ khó src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3390,7 +3490,7 @@ Lightning src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3399,7 +3499,7 @@ Các nút Lightning trên mỗi mạng src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3420,7 +3520,7 @@ Năng lực mạng Lightning src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3441,7 +3541,7 @@ Nút Lightning trên mỗi ISP src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3454,7 +3554,7 @@ Nút Lightning trên mỗi quốc gia src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3471,7 +3571,7 @@ Bản đồ thế giới nút Lightning src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3488,7 +3588,7 @@ Bản đồ thế giới các kênh nút Lightning src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3509,11 +3609,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3543,11 +3643,11 @@ Tỷ lệ băm (MA) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3667,7 +3767,7 @@ Các chỉ số phần thưởng src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3676,7 +3776,7 @@ (144 khối) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3685,7 +3785,7 @@ Khối mới nhất src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3698,7 +3798,7 @@ Sự điều chỉnh src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3707,7 +3807,7 @@ Truyền tải Giao dịch src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3882,9 +3982,8 @@ 58 - - blocks - khối + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3893,6 +3992,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4115,7 +4249,7 @@ src/app/components/transaction/transaction.component.html - 290,291 + 291,292 transaction.hex @@ -4339,7 +4473,7 @@ Lọc src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4348,7 +4482,7 @@ Đảo ngược src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4357,7 +4491,7 @@ Giao dịch vBytes mỗi giây (vB / s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4365,196 +4499,187 @@ Just now Vừa mới đây - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago trước - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After Sau - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - Trong ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4688,7 +4813,7 @@ src/app/components/transaction/transaction.component.html - 340,344 + 341,345 Transaction flow transaction.flow @@ -4707,7 +4832,7 @@ Hiển thị nhiều hơn src/app/components/transaction/transaction.component.html - 225,227 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4724,7 +4849,7 @@ Hiển thị ít hơn src/app/components/transaction/transaction.component.html - 227,233 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4737,7 +4862,7 @@ Hiển thị sơ đồ src/app/components/transaction/transaction.component.html - 247,248 + 248,249 show-diagram @@ -4746,7 +4871,7 @@ Thời gian khóa src/app/components/transaction/transaction.component.html - 286,288 + 287,289 transaction.locktime @@ -4755,7 +4880,7 @@ Không tìm thấy giao dịch. src/app/components/transaction/transaction.component.html - 449,450 + 450,451 transaction.error.transaction-not-found @@ -4764,7 +4889,7 @@ Đang đợi nó xuất hiện trong mempool ... src/app/components/transaction/transaction.component.html - 450,455 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4773,7 +4898,7 @@ Tỷ lệ phí hiệu quả src/app/components/transaction/transaction.component.html - 485,488 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -5228,6 +5353,10 @@ src/app/docs/api-docs/api-docs.component.html 13 + + src/app/docs/api-docs/api-docs.component.html + 14 + faq.big-disclaimer @@ -5235,7 +5364,7 @@ Dịch vụ REST API src/app/docs/api-docs/api-docs.component.html - 41,42 + 42,43 api-docs.title @@ -5244,11 +5373,11 @@ Điểm cuối src/app/docs/api-docs/api-docs.component.html - 50,51 + 51,52 src/app/docs/api-docs/api-docs.component.html - 104,107 + 105,108 Api docs endpoint @@ -5257,11 +5386,11 @@ Sự miêu tả src/app/docs/api-docs/api-docs.component.html - 69,70 + 70,71 src/app/docs/api-docs/api-docs.component.html - 108,109 + 109,110 @@ -5269,7 +5398,7 @@ Push mặc định: hành động: 'want', dữ liệu: ['blocks', ...] để thể hiện những gì bạn muốn đẩy. Có sẵn: khối , mempool-khối , live-2h-chart c195a641ez0c195ez0. Đẩy các giao dịch liên quan đến địa chỉ: 'track-address': '3PbJ ... bF9B' a0c95ez0 đầu vào để nhận các giao dịch đầu vào a0c95ez0 a0c95ez0 đó để nhận địa chỉ đầu vào là all95ez0. Trả về một mảng các giao dịch. địa chỉ-giao dịch cho các giao dịch mempool mới và giao dịch khối cho các giao dịch được xác nhận khối mới. src/app/docs/api-docs/api-docs.component.html - 109,110 + 110,111 api-docs.websocket.websocket @@ -5444,6 +5573,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5558,6 +5691,14 @@ src/app/lightning/channels-list/channels-list.component.html 43,46 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 + src/app/lightning/node-statistics/node-statistics.component.html 4,5 @@ -5676,7 +5817,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5817,7 +5958,7 @@ satoshi src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6079,6 +6220,14 @@ src/app/lightning/group/group.component.html 40,44 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 + src/app/lightning/node-statistics/node-statistics.component.html 28,29 @@ -6127,6 +6276,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6604,19 +6757,22 @@ lightning.share - nodes - nút + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6624,7 +6780,7 @@ công suất BTC src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6742,11 +6898,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.zh.xlf b/frontend/src/locale/messages.zh.xlf index d2cda98c6..d2ec0f162 100644 --- a/frontend/src/locale/messages.zh.xlf +++ b/frontend/src/locale/messages.zh.xlf @@ -749,11 +749,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -774,11 +774,11 @@ src/app/components/about/about.component.html - 375,378 + 391,394 src/app/components/mining-dashboard/mining-dashboard.component.html - 88 + 87 src/app/dashboard/dashboard.component.html @@ -804,7 +804,7 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 90 + 89 src/app/dashboard/dashboard.component.html @@ -1073,7 +1073,7 @@ src/app/components/transaction/transaction.component.html - 282,284 + 283,285 transaction.version @@ -1201,11 +1201,11 @@ src/app/components/transaction/transaction.component.html - 256,261 + 257,262 src/app/components/transaction/transaction.component.html - 400,406 + 401,407 transaction.details @@ -1222,11 +1222,11 @@ src/app/components/transaction/transaction.component.html - 243,247 + 244,248 src/app/components/transaction/transaction.component.html - 371,377 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1244,7 +1244,7 @@ src/app/components/transaction/transaction.component.ts - 244,243 + 246,245 @@ -1486,7 +1486,7 @@ 社区联盟 src/app/components/about/about.component.html - 275,277 + 291,293 about.alliances @@ -1495,7 +1495,7 @@ 项目翻译者 src/app/components/about/about.component.html - 291,293 + 307,309 about.translators @@ -1504,7 +1504,7 @@ 项目贡献者 src/app/components/about/about.component.html - 305,307 + 321,323 about.contributors @@ -1513,7 +1513,7 @@ 项目成员 src/app/components/about/about.component.html - 317,319 + 333,335 about.project_members @@ -1522,7 +1522,7 @@ 项目维护者 src/app/components/about/about.component.html - 330,332 + 346,348 about.maintainers @@ -1580,7 +1580,7 @@ src/app/components/amount/amount.component.html - 20,23 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -2043,7 +2043,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2092,7 +2092,7 @@ src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2113,7 +2113,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2154,7 +2154,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2180,7 +2180,7 @@ src/app/components/transaction/transaction.component.html - 472 + 473 src/app/components/transactions-list/transactions-list.component.html @@ -2202,7 +2202,7 @@ src/app/components/transaction/transaction.component.html - 475,477 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2214,7 +2214,7 @@ src/app/lightning/channels-list/channels-list.component.html - 41,42 + 41,43 Transaction fee rate transaction.fee-rate @@ -2296,11 +2296,11 @@ src/app/components/transaction/transaction.component.html - 477,480 + 478,481 src/app/components/transaction/transaction.component.html - 488,490 + 489,491 src/app/components/transactions-list/transactions-list.component.html @@ -2330,7 +2330,7 @@ src/app/components/transaction/transaction.component.html - 268,271 + 269,272 Transaction Virtual Size transaction.vsize @@ -2404,7 +2404,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2445,7 +2445,7 @@ src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2462,7 +2462,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2503,7 +2503,7 @@ src/app/components/transaction/transaction.component.html - 264,266 + 265,267 src/app/dashboard/dashboard.component.html @@ -2531,7 +2531,7 @@ src/app/components/transaction/transaction.component.html - 272,274 + 273,275 @@ -2629,6 +2629,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2837,11 +2841,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2881,7 +2885,7 @@ src/app/components/transaction/transaction.component.html - 248,253 + 249,254 src/app/lightning/channel/channel.component.html @@ -3069,13 +3073,17 @@ Difficulty Adjustment 难度调整 + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3083,11 +3091,11 @@ Remaining 距离下次调整 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3096,11 +3104,11 @@ blocks 区块 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3121,11 +3129,11 @@ block 区块 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3138,11 +3146,11 @@ Estimate 预估调整量 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3151,20 +3159,24 @@ Previous 之前 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period 当前阶段 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3173,11 +3185,99 @@ Next Halving 距离下次奖励减半 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) 最低 2 倍最小值或低优先率（以较低者为准） @@ -3335,7 +3435,7 @@ 挖矿 src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3344,7 +3444,7 @@ 矿池排名 src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3357,7 +3457,7 @@ 矿池优势 src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3370,7 +3470,7 @@ 哈希率与难度 src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3379,7 +3479,7 @@ 闪电网络 src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3388,7 +3488,7 @@ 闪电网络节点网络分布 src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3409,7 +3509,7 @@ 闪电网络容量 src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3430,7 +3530,7 @@ 闪电网络节点按 ISP 排序 src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3443,7 +3543,7 @@ 闪电网络节点按国家或地区排序 src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3460,7 +3560,7 @@ 闪电网络节点全球地图 src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3477,7 +3577,7 @@ 闪电网络频率世界地图 src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3498,11 +3598,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3532,11 +3632,11 @@ 哈希率（MA） src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3656,7 +3756,7 @@ 奖励统计 src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3665,7 +3765,7 @@ （近 144 个区块） src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3674,7 +3774,7 @@ 最新区块 src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3687,7 +3787,7 @@ 难度调整 src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments @@ -3696,7 +3796,7 @@ 广播交易 src/app/components/mining-dashboard/mining-dashboard.component.html - 92 + 91 src/app/components/push-transaction/push-transaction.component.html @@ -3870,9 +3970,8 @@ 58 - - blocks - 区块 + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3881,6 +3980,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -4103,7 +4237,7 @@ src/app/components/transaction/transaction.component.html - 290,291 + 291,292 transaction.hex @@ -4318,7 +4452,7 @@ 过滤 src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4327,7 +4461,7 @@ 倒置 src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4336,7 +4470,7 @@ 交易字节/秒 (虚拟字节) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4344,196 +4478,187 @@ Just now 现在 - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago 之前 - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After 之后 - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - 之内 - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4665,7 +4790,7 @@ src/app/components/transaction/transaction.component.html - 340,344 + 341,345 Transaction flow transaction.flow @@ -4684,7 +4809,7 @@ 展示更多 src/app/components/transaction/transaction.component.html - 225,227 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4701,7 +4826,7 @@ 展示更少 src/app/components/transaction/transaction.component.html - 227,233 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4714,7 +4839,7 @@ 显示图表 src/app/components/transaction/transaction.component.html - 247,248 + 248,249 show-diagram @@ -4723,7 +4848,7 @@ 锁定时间 src/app/components/transaction/transaction.component.html - 286,288 + 287,289 transaction.locktime @@ -4732,7 +4857,7 @@ 交易未找到 src/app/components/transaction/transaction.component.html - 449,450 + 450,451 transaction.error.transaction-not-found @@ -4741,7 +4866,7 @@ 等待交易出现在内存池 src/app/components/transaction/transaction.component.html - 450,455 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4750,7 +4875,7 @@ 有效收费率 src/app/components/transaction/transaction.component.html - 485,488 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -5201,6 +5326,10 @@ src/app/docs/api-docs/api-docs.component.html 13 + + src/app/docs/api-docs/api-docs.component.html + 14 + faq.big-disclaimer @@ -5208,7 +5337,7 @@ REST API 服务 src/app/docs/api-docs/api-docs.component.html - 41,42 + 42,43 api-docs.title @@ -5217,11 +5346,11 @@ Endpoint src/app/docs/api-docs/api-docs.component.html - 50,51 + 51,52 src/app/docs/api-docs/api-docs.component.html - 104,107 + 105,108 Api docs endpoint @@ -5230,11 +5359,11 @@ 描述 src/app/docs/api-docs/api-docs.component.html - 69,70 + 70,71 src/app/docs/api-docs/api-docs.component.html - 108,109 + 109,110 @@ -5242,7 +5371,7 @@ 默认推送：操作: 'want', 数据: ['blocks', ...] 来表达你想要推送的内容。可用字段：blocks，mempool-blocks，live-2h-chart，和stats。推送与地址有关的事务。'track-address': '3PbJ...bF9B' 接收所有包含该地址的新事务作为输入或输出。返回一个交易数组。address-transactions用于新的mempool交易，block-transactions用于新的块确认交易。 src/app/docs/api-docs/api-docs.component.html - 109,110 + 110,111 api-docs.websocket.websocket @@ -5417,6 +5546,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -5529,6 +5662,14 @@ src/app/lightning/channels-list/channels-list.component.html 43,46 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 + src/app/lightning/node-statistics/node-statistics.component.html 4,5 @@ -5647,7 +5788,7 @@ src/app/lightning/channels-list/channels-list.component.html - 42,43 + 42,44 lightning.closing_date @@ -5784,7 +5925,7 @@ sats src/app/lightning/channels-list/channels-list.component.html - 63,67 + 63,68 src/app/lightning/channels-list/channels-list.component.html @@ -6044,6 +6185,14 @@ src/app/lightning/group/group.component.html 40,44 + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 + src/app/lightning/node-statistics/node-statistics.component.html 28,29 @@ -6092,6 +6241,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6558,19 +6711,22 @@ lightning.share - nodes - 节点 + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6578,7 +6734,7 @@ BTC 容量 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6696,11 +6852,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 From a5dd141934ec536f5733192584f071d0fc6a16d8 Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Tue, 14 Mar 2023 15:39:15 +0900 Subject: [PATCH 13/60] Don't fetch prices on signet/testnet, always show 0 --- backend/src/api/database-migration.ts | 7 ++++++- backend/src/tasks/price-updater.ts | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts index 1ef31c90b..ab38b0543 100644 --- a/backend/src/api/database-migration.ts +++ b/backend/src/api/database-migration.ts @@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository'; import { RowDataPacket } from 'mysql2'; class DatabaseMigration { - private static currentVersion = 58; + private static currentVersion = 59; private queryTimeout = 3600_000; private statisticsAddedIndexed = false; private uniqueLogs: string[] = []; @@ -510,6 +510,11 @@ class DatabaseMigration { // We only run some migration queries for this version await this.updateToSchemaVersion(58); } + + if (databaseSchemaVersion < 59 && (config.MEMPOOL.NETWORK === 'signet' || config.MEMPOOL.NETWORK === 'testnet')) { + // https://github.com/mempool/mempool/issues/3360 + await this.$executeQuery(`TRUNCATE prices`); + } } /** diff --git a/backend/src/tasks/price-updater.ts b/backend/src/tasks/price-updater.ts index ccb8d3e68..716ac9ee6 100644 --- a/backend/src/tasks/price-updater.ts +++ b/backend/src/tasks/price-updater.ts @@ -73,6 +73,11 @@ class PriceUpdater { } public async $run(): Promise { + if (config.MEMPOOL.NETWORK === 'signet' || config.MEMPOOL.NETWORK === 'testnet') { + // Coins have no value on testnet/signet, so we want to always show 0 + return; + } + if (this.running === true) { return; } @@ -88,7 +93,7 @@ class PriceUpdater { if (this.historyInserted === false && config.DATABASE.ENABLED === true) { await this.$insertHistoricalPrices(); } - } catch (e) { + } catch (e: any) { logger.err(`Cannot save BTC prices in db. Reason: ${e instanceof Error ? e.message : e}`, logger.tags.mining); } From 7bf8fea9f2d18260f8d36471fa2fb92aff834840 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Tue, 14 Mar 2023 16:58:02 +0900 Subject: [PATCH 14/60] Limit special blocks by network, add future halvings --- frontend/src/app/app.constants.ts | 61 +++++++++++++++++++ .../blockchain-blocks.component.html | 2 +- .../blockchain-blocks.component.ts | 4 ++ .../mempool-blocks.component.ts | 4 +- .../app/components/start/start.component.ts | 17 +++--- 5 files changed, 75 insertions(+), 13 deletions(-) diff --git a/frontend/src/app/app.constants.ts b/frontend/src/app/app.constants.ts index f15733bb0..8a091706a 100644 --- a/frontend/src/app/app.constants.ts +++ b/frontend/src/app/app.constants.ts @@ -139,26 +139,87 @@ export const specialBlocks = { '0': { labelEvent: 'Genesis', labelEventCompleted: 'The Genesis of Bitcoin', + networks: ['mainnet', 'testnet'], }, '210000': { labelEvent: 'Bitcoin\'s 1st Halving', labelEventCompleted: 'Block Subsidy has halved to 25 BTC per block', + networks: ['mainnet', 'testnet'], }, '420000': { labelEvent: 'Bitcoin\'s 2nd Halving', labelEventCompleted: 'Block Subsidy has halved to 12.5 BTC per block', + networks: ['mainnet', 'testnet'], }, '630000': { labelEvent: 'Bitcoin\'s 3rd Halving', labelEventCompleted: 'Block Subsidy has halved to 6.25 BTC per block', + networks: ['mainnet', 'testnet'], }, '709632': { labelEvent: 'Taproot 🌱 activation', labelEventCompleted: 'Taproot 🌱 has been activated!', + networks: ['mainnet'], }, '840000': { labelEvent: 'Bitcoin\'s 4th Halving', labelEventCompleted: 'Block Subsidy has halved to 3.125 BTC per block', + networks: ['mainnet', 'testnet'], + }, + '1050000': { + labelEvent: 'Bitcoin\'s 5th Halving', + labelEventCompleted: 'Block Subsidy has halved to 1.5625 BTC per block', + networks: ['mainnet', 'testnet'], + }, + '1260000': { + labelEvent: 'Bitcoin\'s 6th Halving', + labelEventCompleted: 'Block Subsidy has halved to 0.78125 BTC per block', + networks: ['mainnet', 'testnet'], + }, + '1470000': { + labelEvent: 'Bitcoin\'s 7th Halving', + labelEventCompleted: 'Block Subsidy has halved to 0.390625 BTC per block', + networks: ['mainnet', 'testnet'], + }, + '1680000': { + labelEvent: 'Bitcoin\'s 8th Halving', + labelEventCompleted: 'Block Subsidy has halved to 0.1953125 BTC per block', + networks: ['mainnet', 'testnet'], + }, + '1890000': { + labelEvent: 'Bitcoin\'s 9th Halving', + labelEventCompleted: 'Block Subsidy has halved to 0.09765625 BTC per block', + networks: ['mainnet', 'testnet'], + }, + '2100000': { + labelEvent: 'Bitcoin\'s 10th Halving', + labelEventCompleted: 'Block Subsidy has halved to 0.04882812 BTC per block', + networks: ['mainnet', 'testnet'], + }, + '2310000': { + labelEvent: 'Bitcoin\'s 11th Halving', + labelEventCompleted: 'Block Subsidy has halved to 0.02441406 BTC per block', + networks: ['mainnet', 'testnet'], + }, + '2520000': { + labelEvent: 'Bitcoin\'s 12th Halving', + labelEventCompleted: 'Block Subsidy has halved to 0.01220703 BTC per block', + networks: ['mainnet', 'testnet'], + }, + '2730000': { + labelEvent: 'Bitcoin\'s 13th Halving', + labelEventCompleted: 'Block Subsidy has halved to 0.00610351 BTC per block', + networks: ['mainnet', 'testnet'], + }, + '2940000': { + labelEvent: 'Bitcoin\'s 14th Halving', + labelEventCompleted: 'Block Subsidy has halved to 0.00305175 BTC per block', + networks: ['mainnet', 'testnet'], + }, + '3150000': { + labelEvent: 'Bitcoin\'s 15th Halving', + labelEventCompleted: 'Block Subsidy has halved to 0.00152587 BTC per block', + networks: ['mainnet', 'testnet'], } }; diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html index 8323cf8c6..6cdb895ff 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html @@ -6,7 +6,7 @@
+ [class.blink-bg]="isSpecial(block.height)">  
diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts index 30b98813a..9c0049c4d 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts @@ -269,6 +269,10 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy { this.cd.markForCheck(); } + isSpecial(height: number): boolean { + return this.specialBlocks[height]?.networks.includes(this.stateService.network || 'mainnet') ? true : false; + } + getStyleForBlock(block: BlockchainBlock, index: number, animateEnterFrom: number = 0) { if (!block || block.placeholder) { return this.getStyleForPlaceholderBlock(index, animateEnterFrom); diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts index 8a0a06f0c..57fba7966 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts @@ -116,9 +116,7 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { mempoolBlocks.forEach((block, i) => { block.index = this.blockIndex + i; block.height = lastBlock.height + i + 1; - if (this.stateService.network === '') { - block.blink = specialBlocks[block.height] ? true : false; - } + block.blink = specialBlocks[block.height]?.networks.includes(this.stateService.network || 'mainnet') ? true : false; }); const stringifiedBlocks = JSON.stringify(mempoolBlocks); diff --git a/frontend/src/app/components/start/start.component.ts b/frontend/src/app/components/start/start.component.ts index 77c8fd7f2..dde7bc234 100644 --- a/frontend/src/app/components/start/start.component.ts +++ b/frontend/src/app/components/start/start.component.ts @@ -85,21 +85,20 @@ export class StartComponent implements OnInit, OnDestroy { }); this.stateService.blocks$ .subscribe((blocks: any) => { - if (this.stateService.network !== '') { - return; - } this.countdown = 0; const block = blocks[0]; for (const sb in specialBlocks) { - const height = parseInt(sb, 10); - const diff = height - block.height; - if (diff > 0 && diff <= 1008) { - this.countdown = diff; - this.eventName = specialBlocks[sb].labelEvent; + if (specialBlocks[sb].networks.includes(this.stateService.network || 'mainnet')) { + const height = parseInt(sb, 10); + const diff = height - block.height; + if (diff > 0 && diff <= 1008) { + this.countdown = diff; + this.eventName = specialBlocks[sb].labelEvent; + } } } - if (specialBlocks[block.height]) { + if (specialBlocks[block.height] && specialBlocks[block.height].networks.includes(this.stateService.network || 'mainnet')) { this.specialEvent = true; this.eventName = specialBlocks[block.height].labelEventCompleted; setTimeout(() => { From cdfde05452b78c18a11b5932eddd3df3fca05296 Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Wed, 15 Mar 2023 02:25:41 -0400 Subject: [PATCH 15/60] Make new folder for promo video assets Video, cover image, and subtitle files. --- .../app/components/about/about.component.html | 6 +++++- .../src/resources/promo-video/mempool-promo.jpg | Bin 0 -> 47149 bytes frontend/sync-assets.js | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 frontend/src/resources/promo-video/mempool-promo.jpg diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 73e7a17a2..a0ea005dd 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -13,7 +13,11 @@

Our mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, completely self-hosted without any trusted third-parties.

- +

Enterprise Sponsors 🚀

diff --git a/frontend/src/resources/promo-video/mempool-promo.jpg b/frontend/src/resources/promo-video/mempool-promo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..40715b507fb0866f505807c7eb7bc59225d32e92 GIT binary patch literal 47149 zcmc$`1z23omM+{_2oebH?jGD}lHdfF#tH83F2UUi9;9)14+-vWjk~-1&pGqonQ!LI znfcDlxzFAGbnmBo@2*{|s@7Yp-nCY}%)P7v-b;x|iUFXY005}h7vN<95CC`s3-<;N z_RSl(H}LRp-Xgw7L_|P9#6&?wevgBRi;IJajg3!4MS@R2L5Ph_%1BBe4bhfhUKLrX``!O6wV!^`(sL{v;%LQ+aeSw$73 zrmkUNXk=_+YG&@>=;Z9;>gN6}ATTI6Bs458J|QtF`Fl!gPHrAJzo4+FxVomcuD+qM zsrh$jS9ecuU;n_w8}#~If4BDM-u(3K>sSw3j}}+1NGWrFlYcE;I6viy*!jK8~_vW-=66G zC18qvpqifo10DA+O=p!Fmen0%XE`r9PWL(V%ZfTyw-g4xc$b})$TcoPoMw}joGZ)C z*2tKqBQa8MwMSSKZY@eRdmX5nOZVWH7iJn+)trK*WOhdundrX@ZkfZ#Lb8@`b`Yt7^8%m6Z7oQ7S>W&U}|I4{eHDt@rt zr2%*dRcIHFI#-uWFLb)c*K%I~f-e9m&!88;e7io$JG2)7)9ZI$m+lR6}og_`w4Ep4hdH)0opy!P?MpvrkOka_Z>plT_ThsV;bm}_} zcctv16KJzd>4Ur|(mYneXsN>9`H%gH(g?$pDYISK6v~7ER^5z^;s=fM*kiE4uVJ1g4KEN95iHwaCnk!e}H`rwvRz_HJeyVxpthAJ_Ad7V6}R-oJ;If7!bt&Jb1 z8Yj3?CZF!MH~4wS2WQ`^#5L%AZ{#yC%$`mg&v`e+Mir+ZSeydC_QRjm0t71qw#6P_ z!x|`A`r|&ky6I7=paI8FOp#5fsKm*`g1LL#b<@0LKAgjv7r-dZW6=ZMHOY+W3xJK& zlP-VQsRF_vvVhguKosbppG&J~-K&EL=1X*pbDp}^Me9X!b-!ZxW`{~vbYrt{|n{ernMgt|%yfEN0w?9{(! zeWfpQXr*UK)wfCN&jDuKvJ&!HUz>_waYU1be%!XIkl$&>X>+A-`2>|h6#K9jhEyJw zh~4LRwAxHjnd>8l00Ch`cf{?8oNMFu9x-=*b@Q3HqqmqBQL8hPdBx)ivJtRG;#i0o ze2;@K0IWKeN>}o$Uw2^bZ)X+Zf!z3u71>ww0e7_QTT+*!aeubY|3UPJKHA!Jm|ysm z)K4JtLCeV;-aZlf|I(viCfo53>QB{hnYWc$xj=TkSVyZ2z4MKdb4Q)DlAP4;=B`;{ zv6yX_npKldDsk>?OPKY>-nnIFis{{M2%`_$48;)}MDt)ih5ZrD^_x(#_S2ax6B|B> zts3gd%*2bi0kj~p5q|bu_6j`32>nr_QaR**Dq8=Sg~5PiPp`|0)MPyL3Kq3AKiQt( zn`GJO{sxcG&DXfQn%9xc1@OPfp%A900@nRDkyIz7HQWG`gIk z41nrSWAWc;B@|>_lYvFS|xo=&7A=)fgA5P7LH&G&i zm6yaXfJBGs^6Z?&tLn#UwP^4B*vCRSJv34RM6MO+F3MGjm52+3-Hv^ao5hPGRs zBK=Ix&ruF7$fLyW-S`V2Ipjk{mUr)2Nub$hgLsVO@vZ|ZlOMfr<|f&TYvVgy(NwL2L?|Nu^Tej8 zy5oU31kfMo^Skjbze6~#Kwakm4LTf!BL(bV=@ABr00;^GqxGibN=x;ut@be;i-mqtMihilR9GW8Iwgw zta$m?+6w?ixx|g|d~N#L+?(W7j&thhT~Mxr=?LL33NbZg6L`F`_~xdI#G(iKxPtk) zk}pGlW&p#?c;k5TM$3m08EAKE5^`{L?D({Jcz}e+^NJqotB$tZ94%O^6qcM{0Kjv> zHY^1!v`;w^^nSi@wj{ENwV$hmp?<(}Kn=QOtL7)+F-gA^1w(`%`WxY+Ikj8 z{EG^TTD$50zq25Sa5{H|#y6OlY~QN8tiAxM5uOvv@Xhn4jH={|=g}>IVEJZqx_;SLzoy2QO?+Zj zwMjmqsF+f8Q+dWqYK&!xiht;#4}Aws_Z+$?C4LE0!GJ9Bhi zC7vl4av_A0<@?MipS2`Dz5x92B{_42#L+nUs^jMCO(t3Y&hXD1foKjE9<369V~!L~ zRNgkVt2D`fOHTkPS?~OEziK|V5>nMw-cFQgmP<14)v7)e@$Qee%h%P6qp8ghDm1r_ zGE*obS|2Da{plugA7+V>N`=%-u_sDsz5wQ+|RdrrgIdc7%!6{mbFgWLA7rMycp;6CT~Sn6}>J5 z#=ijAkE@?4ccgd<=Wld3Z8|v|#E5A?N{jfX^y5WhT6I_{SD3}WOWlfEvaeG9VqyBq zvyXVQ?(&hl>YRWYYb8!P=|402F!0B(%tmB-F}Pz)h%jW8wU2M6-5B?3V z{v#;*kJvY;Vcbcg5>qu*9j_}}*jRjS!&s^2^!H+Kf4mv{Lpd%a@MVuDxVal4+0M^d zGtH;wSIkzQ2+yl7QBoT+-SFM)nAx1u4MDk@^9wg=L<8Z`zfJF&4;6!rQob`U%X8xm z>-7i4Raa@%@rOZ{bAq|Kb_aLQHd1w!^PX{T19zt1zW~fN`wp!gcV&fPzV`6;7vHx| z+!*)Sh2Q3U)wPl+r-Cu3HHH~;DsO@Cr8{(5c#trUJR45%?hnZw=n5?@4ZYp_J8c9n ze)_y}L`+wsWn#9Z{TuatjH?+1je(UQZ*^T6O%e~M<-?=567-_3wE&mIg(>v9}+qOA*Ol| zv(VR;mK!ItiCYr56Mnw1{qgih?h&!&gZ%h#7JJ%EYoZV&lT*7l;@@WdKa8_~){mCe7eEJ{NQ>3`=I9SQLpxgnJ20GMg>;kG zF?(a4$#Yh<=bEzdpB4<2Vl2MnI4rhr_Tvum&(j8RCIb`V$@XJ8 z)=J)m7r;JVh0oizAcBmm*~e%Y^koX1zIqLxlqJ_BAl9IKP= zWdH3A7ML$CZH7yG1foE$>4r?L@=0IGzw^iaO!}GPmW|R_eqCjy3{y*R;5@;Uf?@=N zcv4QYAR<$zvXeJaQ@s3zz$I=pp5EeYp9v4X8oyN9O7{MzQZSLsouLG&8zmVEOq<>O%+rnfMtO_nfLL5Qslq?(t1pMqul@$YrP z|3o=p{Ht~g&Wq*a=K)p}SzUb~z1M<_iJ?nIO4U(5xE8N?ga zG6aNH&L`I3#}tlTkkH>@PXlMPS?>X~+rfHsx|MsePdmQ^5f9JP@y4OGEFNzarwiH8rjEg?wmOYHofX2YcsP zT>^AEiZzVjAj%$%COKY0ZNOO&9gQqnR3Wo`GPSu-97V5nlW{cr3{f zpm$bn3JXMeFW zC%&DK5oy$$;t+p#ChJ4daUaaXQU&C~!fi1BvN>eX9~>{_Qt|%I_U{p^g8Zx9H5{`I z&@3FZfC^6!P)RanLYg!0flLu)wDF`ff&JMD;*c#tVFe2?Z94+*+EeJ~d{ayHwCCAz zxWt=2=Umo9_Ae|3TQ-WZbN0=x+yXE$8=<9d3*NbN#KE$-vK!(c{jhajH97cv-#ijd!NDZFRI#YUNhkNt8?i}mA=Jn8%hiBrA z1CLfPMH^?E*G0c)o!s)S#f@;L6RcM)%pw%MR-uIE@w%OrQd76Zy{Plcqb57KR*WZN zVlVnUJ8v(a7}jbQc6%WH z#cA!`J_|)Sd)Z+jM}s>FGpN$D@PBF7ua>&gJr*ZWUJDbvJ@C8YcuM#GozT%wipa}f zE2PS3T9MB4SXc{^-@@(2s+1;~h_-Xm)4PC;gh6iDkWMA~i8fbmA{Z+wv?mf zaEqujeJNo^mhS@WS@Fw-3^pROVNAsR2rS>S-khdf?qmGWPj*#&t>gvWiNtLWzacj_Sg59_x71BM>=cKD(8gc& z2uE0XKo+`9^B@+kq}^c_3vBk`bMfE1^L=t-{2 zvgJPsh{bR#TH=yR27J6SCYj_o816-&zORk8Aq(ar8?0t~w5oYVmoEE8;sVspX|ip& zHs4`(vMHBc){PC+hEMn-vJvl`x(s~#{n;^uSbgbKPB8eg!USrd=-A6!61H;ocz(B@ zjsHuPC@`ryru0`O>xs4#1%U&n2QgTJirBcqz~a!wW0_;xz)M?%fbDm9A(emO*`3nQKVkbn2S%?KcBBRXgkpp+eku2BRFEw z%#omJQ3NT>TM$owv}{DXRejqsX#Xm;EXVuC0DI|V)+p!U7)e&u~P zM;aa&+c2-S z5JnUdK@nYKJ}34@ffe&|2g;-F71$k3yRXaf_s;W@?T`A)&g>mcfyQ-nCt=l0X1`dj zg5zFE1-tk9+}s~Cc@I{2!5q8eQVgn&K>LiOE!=PW8mV-Qp1r+8^JL!bzZ=RFd8E+O zcB7S0Wf&-3N&=yj^~3@0pzZ4Tc>AQold6k`-Y1)*XZm27(3*Dvt~U3(i&>L42RfOE zgq7P~a;d`y4%70wCKm$DEvS@#hMM?S(gzMkkQVAU9jb`ItqQH=Ver6Q`6ZR?T;w?T4RNXlQ_oTnQ3u}_0GOt)!9d>9BH^>YBrp*ven>0tRGc6>jpD4#O>eGT z`7;AO7nb;jlq{WT;6RWJGiwdZY3Wn$`GX%NX+}L-E8cXR+^dd0+S|$HZL<#pI5*_+Px@+7_^5A4*mPCu*c)9c4He^9l&u74o;!Hw^pPo;~qc_BlXT?4&=H{SwjSs_BLwQclLEXw1 zJ4<|?9kpqW@(x!8D?BosBIStIwR*=&-=3-T>uBRP#X3)RY7DQDm{c|)Y>7`7 zUp;n@L=FOjgqT};lXI3MZcNpEzUS^=FH7)7w#fMtvo`h|puMgEtwl&4IEjA~ncTv& z9~v%t3bxctl^Q#DQ=p)Zk!jD{N_bk4dmShOmy$^) zQnxkP^La~jP0m<;Z9KJk&yq~MK3}6wwbVJDJIZd~^w$|K+`{!BSZfEl2`i@?B>UJi zK0@KK^wbkT@_qw&{zUSKBA^;hqD_Q0Li#+r`Z^z?JxXv6df>*X8LG{Hzw>T{Ne!DT znw6BXbZaVS)u+Hrbw0GM^ZPFybBMSVpTsA8o6O&dokJsYE9C>5HW&6B4-Hg+hTnR>Fw_HfdE$}cl_$M)Os5_+(7$=Z$2I!Vud^zi09lpivins5hpd{@}y=Sk6q zp+n9yeD9EYB8VupouBN6mB%f0Ruw1mTcQ9?#zCJ}sx)VEToB|?&yiMnfHYTjSf0cB zGmZAnP-$}E?%4?}rI^0Ku-iOTG!Y<8AND3)foDJ_%i;_~vX`kJU)(>!O ziaq1+9e33jg3Ko-gHpUj_sL0?ZFU*9PH$aQmJaQ=akqk^8NF$4Nw}64hus{Qx`!ee z&#PRVc^T!DbgCs8C^olfxVD()-~9(~7Ha5Y6Iuss5j?CRKA@^-x$bFFb~i)<21%IP z9{dOM_FoptKMYsp6EB5X!J!1mi#HH<K&O%QT}$TR zX$GiT;OhJ+YP-x&`e<*u6D{!r)5fMT<(`R?7Z~UbIQ&wn-LMp<`>=zRqq5u|o`U{P z=<2@52OIObLPr~JB)B}*e(8(BzIoD{+~wcbA&HKXz$hbGpqO8VluP6f`|f7S+Y~qF926^)NKpX zt;Cg&4!Pt98!HMHKfI8Wb;nq)%5oD_JSukt%1^p+T)1Z&tO!3z7cD!lo~rG@WF{Vr z<*G(tVnqYd{0l;|1Qy5|&zKABqPgsCKd_I$Z)g;&U=Op1uoNozV6Bv}=23q+-VsPm zb(Q$7HN1GVAo77c$`>R@4`nMzHwV{|PtiOEs6X{8X&@MCpxI0JIjp<8_5hlNC_LAh zEE!f^t1-K5kJ36bANCgU<|jr+#BW58xs($J+Dl9|KydAp!0okJ%r9Wjhz(|V# zbi{^nz9W!En7|OG?sX1uKS9Fd3S;eFh$5$x<23t4QSMdr`_t^5>^NB!9bR>p~}FY z#DrPb>$kdm7<4J{?0apoL6I*2#)UJUfa;k# z}dh!gN456FaYnbWJ#iV zp!l^gyJ}^kt}ya+Ddv4Gy!%h=Rwb-Fu9?Y&kAxBwGBGRwWR#}T8HG2;^IAir&9|}Z z2k9p>$I8UxfpVL07KFuNIP7f9k22*;n_36>0lwE3!M$6l5MHmhmq;o0qm0AN>e{0v zten-qCv*)(oN~Z2mN5a{8j_Y!Uy$lG3~ypjB6C#w@mydg8#WZ^3e&IbKI9#q+@Q8j z4ClS0Sc34vzKiW|iliM)fpkrDd#KwNa&C`js5&8q$$%TN86Oj3(n?%XSbvvT?Fjvp z8c`u{pAb_q;AK#9_HoN&K2%0!5LfgvOh~^h)i!lX8N6~oSueSvpjxvZ`Xvmz15*c@ z*|TzJGA#wg9Ek~blx;DH_L;bpzW};^{w8N>HmHsQb|;uz8R({MP#v+BIs3%k#JvDa z21#yx*!vGkZ+(BjcVY~)iQ*16A;Px-B;72SGCDu=K+Tq;n7#}7hs^8$Bpd<8;PV-E zK~CiZ*01yCJGl#*t%cL_FrMOC$8Tf1*`v~rx%WcIFN*EASKLaJ|8 zm@}MY`NxB3t+?6qm5X9<{kQlff&r;kMGNJKB_iv}L!3<-!gL2MwqMg-%!UR*Jx|(o z6z&uJL8SCaf;`&=55##5ar_$@Jw$jd;9ZUSA0&s)Y=c!pmi9RB_WHB8(4u>R9Y2qr z#~x*1R*$|0vlH+;$+c}SkuJoqq&99PU?0`s?bKy;Vn$@xboT36;%mzeY>V0EAenh~ zuEg(6H18SRdhFp`@Guy=hNZP3*|{<=Ir7x;+AzsWl1A#8u|3&J68UC}1=nBGXB#m!#v*9d926i)S;23zQYH`xLAE zCLQ$_WT=y>sHtF6LN~Z1a6hq~ zW-N0#uB9Wx)QV(mjaDv);Qh=Md4ZwEoM2ol_oheqso4Spe9*-O89^Bcc;U%uC{v}s} z74Du?;!~8s7q~b}@CIkd(odGxJz60VYw06m7t9pQOr09-EB{hwfgl4HP@-mT@x#AN z(SIJwoJr_h;ro%XUc@F@!7!!)qbThO)lEc8ZRUsq(U1&5Y|Fbn;W|xGUo+qf!y(+Tqb7|ZdBaPuN1?E+ z=;QY8@CFC$Jx+e46IS929HC=0q&V%GiF~VYizd0waLnMYRyfRE7a5-FohD| zosJO$;0$2J+AsNqKbfsqUJ2qbIBmOd3IsjvV5xQkDV%)EroE~9T1i|7)b2itQ=Z%1 zD_*NC)TCIjWT}&xoW?VvJiD5xP|}M}-8+>iZ++y8&kS+spcU;OG(eJ?JZ53ZoMFly zLtlsj{OY#NJ5wPD?H7wEkxrudY_rB6N{M*$f!bp=Yfn=EIj+S7bnTgRE|%vFCwFI7 zgzj)-(4cR3Ff2Zu47&6A&WL`%GWgiD==uo)QLOH_|F|Vh`>AslYg`&Z%KYZ%&uf&bL~v(Ni>DBbwPD2S4QnoNZe(}1z291mQ}1z#eAmd z{?5#PgX=8xV^)NWk4+ZkpeT>Nj$_@v{5^k24~`whMTIOTtkhmA5yViW?v6*J(Y(S=-<7Y9uXKJ%Q_f(zww+kZ zmrVm_sM`FqsaYmoGGVF36oCAUW#1_!HIclEo}O1a&`Ii#O3_B;AFV1Aj7KS`{gbaQ zAm6{wt8HlJco;S!LJWb(LTx-i2vgZ`qw=P`*{98c^))acwS}xX&P!_QF!nDVCn^8{ zV@%PCslzsMRK#YW#;K@mv;DLNvy)U&iV!g|G;f7IDce|FGo;0H9GnqBdwmkX#xC~r z1Eco=@hzfIO1Yb|@?8PLH3lA5#00<~N(}y?P{!!02^fS7Mvyi%1D97H)DkSUr;sXN zOnWGi8Qr)j{{#>dPZ?Q_BB6V+4$U+*N91DM6CGPhzxh)$dL<=C@)}bE-J}=N8`Au)V$abDs%k zRs$H{Z&gcfz5vMXXSwK$3s_1z>qZ2W>3&NJ7n$VlW8~@cOR80FP~bftkmxDSR;6~T znD0|RXRYxEhf+4zrI`_~uk)PS0}e9zrubA?2KC!Zl!~d_Pt%^#-H@zca*e{Z?@CuU z0D#8z+Jc}W>SQ1C4gd7kFiihPGSdHMS@s{LP z5}eo^F^|6P(evlT!_|#JNw>7MgJRpNd9yvX&@Ws!GLZ#aWVWajG(=~qsS~n`6S^t( zT^H6GO;N}E7)}l*yx$Pjh8;Rha90h&2G}AB`teHcD1g>Uz5GvLoBXWWB|`FVezP=~ z7o0S~cF~$>0&;v+{jLmbS}WQ=m-XLx^;1q6jaOR^B-$7+@GtSMpO0@gCsC{OsBJI` z3#yUmBu;A_)#hZ3msYuOpdBrPR;a7^2)(*{PPAtE6(!Y0@mfI!@Cxw*nU4_y~8cuY|Q=5enHsSvsQ`u7|xa*Y3p5%h;^e4{9kJ5|3q&(RBStb?_^b0zJ0iLn?w>)Z%Ox$iUA`QSdIpx9Db(d#!$X+9#yJhWXgYK7JR>qLB$@3c9=O4Nfd2Mz|)MdwN5ox zYKz4i80z6~HDaNn$yopD&Vg@^6qB`67jVLwirbF!p5=QRy!e(>r`=@oSJ$$cp``V;O zF(jh-UHI&BqsTID)4siHd8s2}5cn>&ybh~S4}F+fNM&S9uAt5fbe*U|Krvi5Usnbh zW(hTnSPakNOho$~c;~&lYWo3D5L6-{-hADd+ETT9JrLVd6jK}qfOYCMzX#=13;LAi zl}3IaB8xRp+`+wLJoiCPUANCj^SK8-!r+8nJWBDUck~sDl+eE`FZW};MO^kb;|6D$ z*sId_##QlEgwc3UYQd5mSCI695++MRUG`r9uy)E>0(U9yr1zznM zT4E<`HyerBgaD|S(yDRn)>Bp}S+XxbZ?{GD3n}W3)Z`p%TQz5yu3=`yj@fhM@RA8= z)+pRZ8OdwNj6pF;-R2%w>*)L_+Ymj`pUS}5YR+n5(rG;uf6UX*!}AEgrgbFqRB(ek zi2nlkUQnWw*TcfhFY()-)%xvY|AEHXx5(p#D>m0F;)1l>`g`f{n+6om1X8%8bf2q( zU=p|?@KiDg^3ZFN3+bB~|Ai^LjvI88QOP&!wIPMTZ7`yi%ylQzg#*QP=TQ9q4e=@M zUR0LUj(y;b?k$3BYl}B+1zSZt9i4HD7~3pWTESOT&OD>y>8BpWu6e=si@-C_(zDO_ zJA_rwx*HlGt#P~kfnT#K1eQL5#{RQ1Z_MHZ&#`&+(jA`@lhD%&WJm4oRPu}MyMc{+ zz%|N=b;V%$W>$Z$;sJPEBD>TASvgIHxB`VEJa19AR+U_At+XOxfs^m)FMy3&S{bH^ zyLZJEhrl#3*^+f6yp0sA*c{|Q6?<8pD^9z3so|xRV$Sr*y5yqd)sRjLoVW^d0#%s( zL!3L~R${U;OMcy%(gz))U@nT3OEH{iqm{CNQM4ZTeHqVo1dWV`)H66)OQ~qXDDxK7 zxBt1W|3P=D{UK&EVnJMXxP$Nc5TUy`{$1q7|B5<6Ul8B^QtWP$x_~MNQC7eQnb_&Q z0EmBubihP|J!C8lO=Fq-t&J0|46=Ub+x*BZ9iGY>YNNPS^3%S>_c4pgPZD*%jF8xg z5ydlr)RZYGeT#=q=e8dum568b0L4EQF2{bdUPyuvm59^j8vodLSYDt_}NhiJv^i-utUUE;J zh|sJJyAQA}X>2gI`Mx2Pus2XUvAr0Y2hMI-n`x*gT_$r{m|SkjppU|i+ODsrwGffC z^-Sn8s`1+smBKQ@jKf?`BAo(T6jB5+I7MP)pWMx`4weXxM~(#la@I6brFc@@d4~1r zuiz$OF_DXPLg1$uckGMlDZl6^I9Wp{@5MdHDhFzuJta`LtrmEsg(V#zcW0@@oGTw8 zw((FWPZ#E`Fg!%<^1ARu<1cY&Fc#z9#m5p$?hw5IK5EZ1Bj{IQdx&aHVlb;|HvKZK z&obf$_07_biG7krJ#BgX!Fu?1=?*m4+8$@lP_&ItjQ(wCT4jM!1YGUqj_9hPppqKZ z_q$F-MmsaM0ElAX77>w$8AbHyaiKl!d1RwWcz`opRluC>8FtZ{nhE%2`L+Y^(PNga zK=PqT`~pE=12naDRdTVpxJVaMrTEc#u{*lxe%2C1X*om|ejTqMPPV3LjGvu2<%f>W zzVG_#6<-IxIYarff)k>==6J)uYf=})!KNb|@Yw698Fsmmx|_vrv*hCy#j~y?t^0e8 zx}o3`{G*I8FWx*f^BeCv!Z?rKGvmw|Ig1y-Dz$7y`CQ+S)d{ga2B3c`tMf;h-m$oH za(4Q(nWQ?uTe@`yRa<5*QP%`|NxUzcgIcjmX)$|qNf8gvFLTGL+ny0z|FRzm-!ewh zv#je{Uo(t`hA4u&G&Q{`6>o3h^spkEcb)=YSvYl085^3Lz{GCD(nA1m!r| zM4TV;@aNEAm0X!6U{}iO4yT#iY1OEoA>VT-0%*OR4O%hRQdm*_+CEmL*R=$4!zr-G~0S>u!%Moz@Hwz91?0(d@~iL&J2W z@mZXQ$n@9j35H{|)bo!6RikC%GxUNvW`tDrA{I7w>D6bNiWMq@%NqDkI-u(9N{+Od{kQk2BUf8f=HYxN&=Ai2tYU$m zUIkH%PnhwK-L7{-c|~IA9yNQn&dDqSQ3Ty=p>+>4L@_T5NT+nOtT{5dD21 zzZV2grD^AnK{5a0HTa{`=@n7n!Y!JPl0^MKg_CwdEh^ZygziB(AG2NR zrLDr2tWA*uUs~Y#(G1o8oW@c3{xEjf=ER5kT9fD9BI%TQLURQXCH#hwi+;Ljksa&B(_0Y)5-I#O*>aesr{ya` zTd{Hjuz6qIZRsfz^dSutuTg<<9N(nv8KUt`TW~2cumy3e^nn5@0^w*(6FSvR)A(o6 zN-<|*O(-RdD)NQR3JS2S)ej z9w}YJ86I5GW!5S*j~Q62uc&QOT`GGRMuA?wAMGg^&v=D8Quhi%teHkX4x|NbFj?AI zD_4r?7MA0#(@#zFV}%gb~r-Y7Hvv zY=W(1WF?Ajy$8wA6)Sk3VUfKp!~0%;!MY_;foNAkJ)abCrv92eCe}Lv9xv|v1gZ(4 zgA8fbi*g2Ksp5#(E#QXgclv36S8K-DUi?y*T}Ul1IBXMelb$~k#-_l>pf<^CX@J!x zxnKZNt~-aNv4*dn(Hgm?fTZBq!=cu0I+qW)L)H_mkOhG|Q$*3`YvDUx{nu;-%peDF zO++6OEeRcwjH7Z!EtgXykSryH>J1Q5E^C2t6rM_R>?su0MZ)J+Fj{}~?G@xJQbzV2 zR3bn&Ll1;e0*%%#(>49pdF)z)bo3eGn&ic8y)sCTgX@ATHLGo0o3M#8y$shxB-NlvM5O9L&CbNuj!N0SycrmD8867>xu-vXk~FqhOnIBilUPxAbNz*kRP$B8_cMWgBJkm_wq zM6Ng~UdL%zn$Wiqpm98a6+eW)3-rNX! zVF2H_r{e02B;6#_XQE$HC)tO$ccfk&3pZ)i;BX|ln+Dwz6=*f(A}}jPu#|5^U+>I^ zq&_48?YB3PFv~tASj4V9xW(pB8!Z*3w!D5_An4p{fOtt~PAiu(mz|f5O7UScbuAkQ zPqJ#dXyDM%)-$|;Zq##n07Lv!xC&^X(3oTy(0cLO3EqZ?V4>Q5P8&vGV%*x32RSOJGHk_y?0CV*!qXzlR4#a zzeY_~s;^aoBFEgWExSKT7FBk&cY=D!PcE+KWo7Nyv zm`W}ik0iTHsi}hv6I}wc`3JD8*G~m&=*XUiS;a$Ze!_Y|@ZqC_8& zIBo>tw-L8hkTnL}mAPUtyVVuG*rpEctj02bxF&-GVQF8Wk{gv>Ci{Zz<3Si6H8H9> zu=6ntMA~}h6Z%zzZHN>!GKMBT8@3k(3evE+Npv=nS&uX~X1qB!yds5qqMrc;v@K%b z2!u}TA8&lo46WNU$NSJJg7T5;gIniE5q(pVe(TCVAL z5U<&jPEo6f;cWynY${olM^&2CP{f%&ivy?Jvq!4%9vO+yAWj_SKz&53zJ*$a0yQM) z$!hH#I;2^`_On1srI4?FI@NHoLBs}?Yl3-?nWz(?>Y9r8S3!^2cb55i+xw#iY9oEa zBNnwoEe7tSlIV5>_$ilOhG$fGT5X#yz$TPyHbYCWE^S*`1 zt#lt$`Mvz)I6ve{JSN5mv2eBEG22;TvC9dVq47)koFM*~nttYuwmMlD*k9WanwUNb zg~$*p)kpP5gHOmC(`#3w*)za)lqEehccOgE5L8*VMg*wk2ij9U@C4CEqhJwX%AZ}c zz{w8ob?X8tz&n81ttuKYj3dvcxyG&RQdsQ;Kz~sql{tzszmzn2{rx)&TW^=ew`&Vi z$%kXDXP6g2g>KeYmCa2r8nltAY?PDp7eFu%-~YX=_&+c_|HcAC&!kvdpX7v~AnfdE z>g`<&Gy6tM)klcq5&>{4KsckT{|Bai0l@o^o!q@+^)K* zFe2&dA91OU3R3Ah*OF{kMEZ&XAVdY5*K$(ilP}dxDRiK#>4?F`c>ewYvw($OzzcMG zeq$f8aARZ>t1_}fi45)Tt~!wLz%CNdt=Ku`1+U*-w|Kofh@b-NFFPhjqM_I^;@V8&!zZ2+70Emoyrvt(IK}9;&;9hd>s!dX3@uUq*$94?q0NKFyVZY+ z^WZ-nZh!kD-_JMdo09gO6$5p;83Z{&2 zyc;mkHPWf7)JRH+lr`+cr4G6ugM%s2$*m6=>_7S9+ghZS(#b4a%Ko-fx7SNnFonl# zIvwA|N60c4suHy#>0rj=Xm5h6{j|OoO=@?Uy^$pmwjKf&M0)|i6}b*%ymvqk=g&bn zr|LMVow)Bd8OwB9^kuy&)uGPamoG{B${vw!m`U$dCq9K|Iv>5>Tu*W;@Vd)R!RU-` zDB-iPm6ab}o17;ZClhluipg9BUr%(1Ase&MnU;fkKUI}vdv4jp^o>`!jISec-R8Dh zSi+Qnw1c^woGP1}y}}6OaU_PA|18eY3)s z$nLpA5vCAW1tlwScm9^;Ye5@{eCtiJui7V)+MU=;EP>+Fq0D&BAR!tD@q$Nv137*H zd^z*V^KN}zEY?gjLTZ;1X>MNtF$~Ux&p4+!yxf@|&@uXHf5g3FT12>%o8F{#8+FQxHZql>JMTg zG}|5NL}|*U7V8`LRTTXtUhU)Sc26h`9d<|6)8(v#0`k#6;G!=pqSoD0X-QN%9j`Jz zN1O$;+k`N?^~n?h0l+dhTnR{=z~Od*5SzEE?*B*HTZYBGKG~v8AR$46G%g7ajRbcK z-dJ#VZ5$eRNYLQ!1b25QxVvkDI|SF>xA*+-Ge_>ZGqdM>>|Z}EAKt3BYSmh+0>10f zCjD=N8_W{b11LMOBah|^qp!Pig?>3bXVfL^(iBli4|hl zGO%J7S{6(~JgSdH zK8Ec-RT`#o2g;PfheYXEBcHi2t5jZILxf#4XFRn9!+j|;U`NY}2C1EijTp%SXT+5F z6<)(|;n~MSC1u@Mr}ra&h+AmZv(g=1xwI{lp{=D!pynGw=-er6W=ec10Mo^MaH3iX}iWlt&AGb5Z%C|uPGzmOu zaIk(V5w;+m&~`skV|b!F)1R$xd$6TgE?HU??<>|~21?&i!nM4%bO%wD;x}X*wJ`e? zZwb>Zt?j#r)zIti{A2mM*GMXJr?$2WoZofu+b(q}s!!se5y zHkH;%Zq_d3%vd!;Wn0WX4zIkMU_Iffz&56TFQxs1{VWuMIhy6T(4KaAn`qO4Aa7%! zhVVHGe$6R^5~=)kG0#;14?c>!BFLlXA~=F`6Q8c+dJECM&CyBN1euC!dit7|n?PYh zKR)j~VvhKuH9g=0%sLeJr46BLu==-hUf}>?A^^{iw?%q?*y8=&E9jNg3Px^UWiM^P zu^f2&q@)wIb9*60IO0-SN?_%j`HN{3xBzc=;np-_BBYDo@-Ew{iMQW)g_%uO_eAel zU!75uP3p0zobmW(GZUw`3ACvsPtMsDz@8)gv{my)k)q@K6<5?Vo*LE4{>$!3=qwlz zzg6w^!VFqz^xkjS!Xnlr5(Y+KHCr!I0$mQc8&if}bglsFg~8|9TbbfiPQpPd?vd<7 z?}V#hqZJhz)I~HNd=B23{|&cGHddk-AJxui#2+w;e{_<@)W2Jl}0K*d+zdmX}*5T>>k$8T2<%^3Trk3y{QuSAsby|mo!djm6_?6}z z=lD%(XI@QN5#p}t9p`nblkaHi4RtbT3h)Dd=>(ub8)U8t^Vj1IJ#qZ{+IrOK6wuT^ zi`^I+`~@(t8mr^=($(w0dVGUY_J7TE3ZCTO*%o?vh3*A~4->yp z=Es`JOo)$YG{5((Oqk2{Nx#_c!*Y-BNooq!n4m*7DR%5dxd-2yDX2NbX;&Ce7M5`G zt456-#+`B0JG%k;HcV|4-U!m~E_Hef*CqF(D zNaVZ}urMAAfQqOt>yT5;dk7U533 z-<}CTCQATVEPX+kEIJfH7RoLFkW2wA5%E=R7sdUY5%kR&G)nCHE5iMun*DkKZI*3@ zN~Z=EK_S#sp|q8M9}EP#_X}blH5bbx-uu!5qiA&N^GA!wAXILC?@gb$l08Fx)zkuf zzoI?|`I`Aze|NgF*f3{V`bCv&+Ick$niInPPbb&^jX_YIJ!ps~%o6 zufyFtH51pyvv6Nhibrj0+dYYxcJf&6mE|>g?8m@ET&%sZr>Scc8=l?Ms$LXAJ#sQs z^53Kqb8vvzy-IrVgub|OPpQv+92fqa*D*rke%oOI%M?|j5F zM}1bx9UQhAs#a!H;11gLIH+ui^W!rlVD>NzH{p=|sI|sghiA(o5)+ekkbpGUaok~k zpg>7Ezoo#(i^bp)C&73oe*PrN1aWTBa-0-XjxXX8&p2u7V-iFV*OhFqrb=VEg45oF zAyJK^YA#-8hUj+T@=|_UYh_?;@?~%Et>B{%gVmzyE&&r65Ku39%+$1pX-l6ZA(usvy4zrn8GIo zWmjoz+ht`ADdD`le?al1&oL!EEi%?nd zgL-XEuoUD~2|s|gYF8oB${|lNO;)vHPu|Wdks9P;ZV!(-mlR~71i(RVlEpg|_7)hB zkfVSa==u|M!ppQDekD_3Ov8s3?n zz&lfsqaXhk`-oD#?@_aH4q3VBZ-ZRnc5J>T&t+fPOHM9MGgEzpAz|OV;ruClq{Baf zzL3H-KNW+FUmBcJlt=D?-p%g4ZO_qsRhswzxHm)3Zn}<~tK!_istL`SPmKvWnfnu6z?25^eNj+l}tKE)Bv4qb7dKJP8PQu>8bp z7bjQo|H-+vCrM^~vyzvE42=QR@V?FD+=`{v|)GJUapes!NIomqv^mDL{KbM^WbQP zgYf$4`IlXKQF$p1Tg>dLsBblEGrqh0&&zJ=bzT)fjtXYZz&W-ub~2z8RkpJ9vvum1 zTO2jobNO2q zQ)uIBgBlTY=33_J<_?B@8S8d`T1*@=6LF}H6JvU&)MyidvHO4@Uv|lK9hhF%cSdg@ z8jFsqGQI%qy$0S3&!AA(_PDSK%f4R#p3gv4SY^ytU`K@J;98T?5DEE0cD0@Z{K&E5Wf|WDFcEyuV-_$n+VlZSp(KSDsf*ludznJU6}4jeLVEjVf3bYUHQGWD{Ef?dy}IIhq!hEESo z^SCeNMMdNXf+XYBO(@$^M`RhJ#_p-=NaC!hEk##G(s2ANc;HQ|LJMz>!pT;{Bz~cGc>W-k`2)R z>VqW-SI!h3D-SR52)lOa7d9lfmaAUhfniL|%V@5n^DS1ZuNAZ0h-SEX+Z_!)NAwkb z$W=_#3m|wMO_Fv|#0=qO9&j0FWlIOmml+*DTNH%D`h#J-k{$n%%lpH$$F!=bQO?Qz4jo350zoK=hT zgQi|Qc4WQ3lg~;9gemxvqx2{|S-U;b@RTW%qc#NFU=ZRqtXX03)@~7fOM{1S@6_{E zn7dO0Ba@t-RYlt&K?U=se!15;w$I&~4?f(7j#88*a_K<;|LtB%hfg-cIm_i*WW%ex zJ649LEO~qUkPwx_>P|9QZ}HVjZD4*&nqn8F4>HhCC%;iB8?}c(m+uZzm5PHs$k>;y zqSfw<-xF;fEUyq=k1bxpos|DMfUu^cHE9sM<6<;%F-_jPUXB)bzD{VsI21s zG*0RBfO%C(qPk|dx}KdjVVA#_tp_IJ@QB?J41NtY%yZq5<(vMXj<|A62#j)=h?S&>}n?b0)4>JaNtVk%qKd)41Rg!cmK=-~xJ7r;y+QTf3 z54^ivcEILt1^)-uoBz_XV*A5YwILUO0dkHtXd@off5E6HVS%9S`>e`vvXI$}U13is z&pFBX-hH6jDN!jb71przE6+;5h{j7L8*kAx`S>y8#U+d9pWgcj)Ax1#O)zTK?^6Mk zylP4_jTQQ8Zv2k!M=6ahk0iUsj{nJ|@_)rK{@+&!^Up%nS2wh+Mv31H{o3Jh{A@_n zC6OSxYBL^@+ze(%1l^5bSs}_LGpf!lou%uBMCn7w-qV<3$1A6q3>xiN_D50m z^?{HrC`RW5B$TSjH|5q8ZcsMD2+V|Iat9mlvqGeWyN&)(nCvz{Z|q?Wcx=hIVg=lP z-wlLt9|hcKSmmVf1tT2&Ml0yYK9q%f7x_!Vfgm(B+iA@|f%0$IwyY+ttp8B@_+B&1 zeJOq<|C2jlALgiNM&1JFdQVpzVcyA!3H5v@6#6*Ok!C}i(v_bVW#aJmm>b!(=I~rXla0ho_7{YdlOSHEbA4vWch#Me3N8AAGLZJ? z5Ag8_Dh`|)=x7yZU(8*?f5*|(`~8QM^PuAnuPXLkC)N*AWVv~j|EJ~z zkI03>^RwT1DLga1cM64*gFhqB&AoVBiy8@S@*Wbw>V2H-P4O@r;OyM!pYr5drMIG{ zAe{~U!EC1Rl9T32tNSp1$-*GIO%owa)6gvm2A_U$7ep0VIk9Z*$M#B+`bsetjp7gg z28DnDXWsPW@xSTT0@26U;w+X$lwPc_V3Z}}TH;UoWJRMPPG^&B3wuwJRc?8)hL3q>FPX;l3mgW^Ab$OQ1b3%stXfqbIZ<&S2C6}HXngoh3u zPu_NDZw&j*_dYEPbp%s)ppLA zvtZD8JhN9nF1F4P!_9%dr{3ZsRlT$XG}K^g%klMNd&3PJnYrm(&%+x|wCvaQ(y|@) zSQM69lr!BF{agW#UjGUjCCaVAY>vusDbAEaT9rJ@R3oz>Mzy!4>?8YvBly~Zu}3*E z4=1a^McyMG)iT&k$d9P1Lfu~az^UC#7J@ac-P@dMs_RNzs^+b_9@jLqpcz*D%>S!O3nf4}RSg^@`gg&ZI)zBrL8yb(&kP%SG!wq-LPp zv^}Qg#9tjJn9Xi@X+;@g8EIW8Y-%P)u^mKO#vPd4&!i)8&(}bckrYfPJu^M+H2djj z9eJkVG0~#EJUR71Ut`v|BD3wY=FrcuDw9_WghFuA#K4AjLoZ@G9oce0Wb%S`V_*x) zp}$MK@CDJY$GGEt*I3)A4f)i=rVgD^2)7&NnEvvqQ^y(_^_laf68NT;=gE-SJ6D%$GFhLM+^N`}+wwWx{U-Mo?Dzf?V9&CMdeO;xi@1r zyKQ9Qzk==`7jggi1Irg#87_iO8x-tBndjHQ3W5!dlef3E!`4=pT(5HXT9x-)85qt6 zIdk%KhdFn$J>Av>lN)T6u1PYNU6>9pxg$VGW~$7K;?gx#C5NCZjbP2m*=7rEHeE3%OYi@ z#AO4$qP>n6l_+IDstJ3Myn;K^98Vn$-(Y{!5Y4u0gGbbV&SIrHY=c8M#RD=?&^`cfW7XBEw12=! zvw#G^qVl%!jT7$Qm@5SwbA1jE-;0yVb$>~k7`WvWX8cr+2z!+yT;OZMed=iYknI!h zJBYxdI4L%8JTLU$ST^uVJy7jwT3V>o5)>!YOJ_wSEYL$wD6IlwXMK9?{aSwfBTrI*FLFdnqKub7pet2 z@m(l5o`cmW@y&mNQdcq~2hzQ$3$~D&qlsrfoKhivje4G^$*&Bu215Md*CSxS<4_tS zM196t)|PX>da-lfiTKspY9b?h#6FetUY&BhtEDH&jU}aQ?{R*^AJ|6RF4HS)p$P=z z_14>xWX_H$ebcl@%TOcO&!k7W{jn!-F=8QW^gx0~=M+0dIf{0|DN%0DPl2?p0sejo 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 N=KN>Fec Date: Wed, 15 Mar 2023 04:49:06 -0400 Subject: [PATCH 16/60] Fetch subtitles files from github For en, sv, and ja. --- frontend/src/resources/mempool-promo.jpg | Bin 47149 -> 0 bytes frontend/sync-assets.js | 12 +++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 frontend/src/resources/mempool-promo.jpg diff --git a/frontend/src/resources/mempool-promo.jpg b/frontend/src/resources/mempool-promo.jpg deleted file mode 100644 index 40715b507fb0866f505807c7eb7bc59225d32e92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47149 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%0DPl2?p0sejo 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 N=KN>Fec Date: Wed, 15 Mar 2023 04:51:44 -0400 Subject: [PATCH 17/60] Make git ignore mp4 and vtt files in /resources --- frontend/.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/.gitignore b/frontend/.gitignore index 9c4b5d5e8..8159e7c7b 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -54,7 +54,8 @@ src/resources/assets-testnet.json src/resources/assets-testnet.minimal.json src/resources/pools.json src/resources/mining-pools/* -src/resources/*.mp4 +src/resources/**/*.mp4 +src/resources/**/*.vtt # environment config mempool-frontend-config.json From 4c294b010d158237b329bcebfa65670b80dc5b6a Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Wed, 15 Mar 2023 06:08:57 -0400 Subject: [PATCH 18/60] Make subtitles default to current locale --- .../src/app/components/about/about.component.html | 6 +++--- frontend/src/app/components/about/about.component.ts | 11 ++++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index a0ea005dd..6e459cbac 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -14,9 +14,9 @@
diff --git a/frontend/src/app/components/about/about.component.ts b/frontend/src/app/components/about/about.component.ts index 0f71645d6..4bf70e435 100644 --- a/frontend/src/app/components/about/about.component.ts +++ b/frontend/src/app/components/about/about.component.ts @@ -68,7 +68,7 @@ export class AboutComponent implements OnInit { tap(() => this.goToAnchor()) ); } - + ngAfterViewInit() { this.goToAnchor(); } @@ -90,4 +90,13 @@ export class AboutComponent implements OnInit { this.showNavigateToSponsor = true; } } + + showSubtitles(language) { + console.log(this.locale); + if( this.locale.startsWith( language ) ) { + return true; + } else { + return false; + } + } } From 599881366b94c5e4e6221c4a55bf86234c32f1ad Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn Date: Wed, 15 Mar 2023 22:43:41 -0700 Subject: [PATCH 19/60] Add GHA for Docker digest --- .github/workflows/get_image_digest.yml | 27 ++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/get_image_digest.yml diff --git a/.github/workflows/get_image_digest.yml b/.github/workflows/get_image_digest.yml new file mode 100644 index 000000000..1fcc16d0e --- /dev/null +++ b/.github/workflows/get_image_digest.yml @@ -0,0 +1,27 @@ +name: 'Print images digest' + +on: + push: + workflow_dispatch: + inputs: + version: + description: 'Image Version' + required: false + default: 'latest' + type: string +jobs: + print-images-sha: + runs-on: 'ubuntu-latest' + name: Print digest for images + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + path: digest + + - name: Run script + working-directory: digest + run: | + sh ./docker/scripts/get_image_digest.sh $VERSION + env: + VERSION: ${{ github.event.inputs.version }} From 5fbdd0bb2a1086019bb31fd4bc02874fa3112857 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn Date: Wed, 15 Mar 2023 22:48:28 -0700 Subject: [PATCH 20/60] Remove push trigger --- .github/workflows/get_image_digest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/get_image_digest.yml b/.github/workflows/get_image_digest.yml index 1fcc16d0e..7414eeb08 100644 --- a/.github/workflows/get_image_digest.yml +++ b/.github/workflows/get_image_digest.yml @@ -1,7 +1,6 @@ name: 'Print images digest' on: - push: workflow_dispatch: inputs: version: From c683a52a01605f81848a3367a15e2c05910b93af Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Thu, 16 Mar 2023 02:29:33 -0400 Subject: [PATCH 21/60] Show captions for non-english locales --- frontend/src/app/components/about/about.component.html | 6 +++--- frontend/src/app/components/about/about.component.ts | 7 +------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 6e459cbac..17920157f 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -14,9 +14,9 @@
diff --git a/frontend/src/app/components/about/about.component.ts b/frontend/src/app/components/about/about.component.ts index 4bf70e435..2bc42bde9 100644 --- a/frontend/src/app/components/about/about.component.ts +++ b/frontend/src/app/components/about/about.component.ts @@ -92,11 +92,6 @@ export class AboutComponent implements OnInit { } showSubtitles(language) { - console.log(this.locale); - if( this.locale.startsWith( language ) ) { - return true; - } else { - return false; - } + return ( this.locale.startsWith( language ) && !this.locale.startsWith('en') ); } } From 0ebe0a5dc9985866c1c2efb2a5455fac5d6dffef Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Thu, 16 Mar 2023 16:13:11 +0900 Subject: [PATCH 22/60] Add new stats in mining pool page --- backend/src/api/mining/mining.ts | 6 + backend/src/repositories/BlocksRepository.ts | 49 ++++++++ .../components/pool/pool-preview.component.ts | 5 - .../app/components/pool/pool.component.html | 106 ++++++++++-------- .../app/components/pool/pool.component.scss | 13 ++- .../src/app/components/pool/pool.component.ts | 10 +- .../src/app/interfaces/node-api.interface.ts | 4 +- 7 files changed, 128 insertions(+), 65 deletions(-) diff --git a/backend/src/api/mining/mining.ts b/backend/src/api/mining/mining.ts index 8b4abb0d6..58626df65 100644 --- a/backend/src/api/mining/mining.ts +++ b/backend/src/api/mining/mining.ts @@ -13,6 +13,7 @@ import BlocksAuditsRepository from '../../repositories/BlocksAuditsRepository'; import PricesRepository from '../../repositories/PricesRepository'; import { bitcoinCoreApi } from '../bitcoin/bitcoin-api-factory'; import { IEsploraApi } from '../bitcoin/esplora-api.interface'; +import database from '../../database'; class Mining { private blocksPriceIndexingRunning = false; @@ -141,6 +142,9 @@ class Mining { const blockCount1w: number = await BlocksRepository.$blockCount(pool.id, '1w'); const totalBlock1w: number = await BlocksRepository.$blockCount(null, '1w'); + const avgHealth = await BlocksRepository.$getAvgBlockHealthPerPoolId(pool.id); + const totalReward = await BlocksRepository.$getTotalRewardForPoolId(pool.id); + let currentEstimatedHashrate = 0; try { currentEstimatedHashrate = await bitcoinClient.getNetworkHashPs(totalBlock24h); @@ -162,6 +166,8 @@ class Mining { }, estimatedHashrate: currentEstimatedHashrate * (blockCount24h / totalBlock24h), reportedHashrate: null, + avgBlockHealth: avgHealth, + totalReward: totalReward, }; } diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts index f2d0a283e..04dcd4b56 100644 --- a/backend/src/repositories/BlocksRepository.ts +++ b/backend/src/repositories/BlocksRepository.ts @@ -330,6 +330,55 @@ class BlocksRepository { } } + /** + * Get average block health for all blocks for a single pool + */ + public async $getAvgBlockHealthPerPoolId(poolId: number): Promise { + const params: any[] = []; + const query = ` + SELECT AVG(blocks_audits.match_rate) AS avg_match_rate + FROM blocks + JOIN blocks_audits ON blocks.height = blocks_audits.height + WHERE blocks.pool_id = ? + `; + params.push(poolId); + + try { + const [rows] = await DB.query(query, params); + if (!rows[0] || !rows[0].avg_match_rate) { + return 0; + } + return Math.round(rows[0].avg_match_rate * 100) / 100; + } catch (e) { + logger.err(`Cannot get average block health for pool id ${poolId}. Reason: ` + (e instanceof Error ? e.message : e)); + throw e; + } + } + + /** + * Get average block health for all blocks for a single pool + */ + public async $getTotalRewardForPoolId(poolId: number): Promise { + const params: any[] = []; + const query = ` + SELECT sum(reward) as total_reward + FROM blocks + WHERE blocks.pool_id = ? + `; + params.push(poolId); + + try { + const [rows] = await DB.query(query, params); + if (!rows[0] || !rows[0].total_reward) { + return 0; + } + return rows[0].total_reward; + } catch (e) { + logger.err(`Cannot get total reward for pool id ${poolId}. Reason: ` + (e instanceof Error ? e.message : e)); + throw e; + } + } + /** * Get the oldest indexed block */ diff --git a/frontend/src/app/components/pool/pool-preview.component.ts b/frontend/src/app/components/pool/pool-preview.component.ts index 277bacb33..0431686d6 100644 --- a/frontend/src/app/components/pool/pool-preview.component.ts +++ b/frontend/src/app/components/pool/pool-preview.component.ts @@ -86,11 +86,6 @@ export class PoolPreviewComponent implements OnInit { regexes += regex + '", "'; } poolStats.pool.regexes = regexes.slice(0, -3); - poolStats.pool.addresses = poolStats.pool.addresses; - - if (poolStats.reportedHashrate) { - poolStats.luck = poolStats.estimatedHashrate / poolStats.reportedHashrate * 100; - } this.openGraphService.waitOver('pool-stats-' + this.slug); diff --git a/frontend/src/app/components/pool/pool.component.html b/frontend/src/app/components/pool/pool.component.html index 0ae32ccb8..d7c791db9 100644 --- a/frontend/src/app/components/pool/pool.component.html +++ b/frontend/src/app/components/pool/pool.component.html @@ -37,13 +37,13 @@
- @@ -88,22 +88,25 @@ - @@ -111,49 +114,46 @@ - - - - - - + - + @@ -234,10 +234,24 @@ {{ block.extras.coinbaseRaw | hex2ascii }} + - - -
Fee {{ tx.fee | number }} sat
Addresses - + + {{ poolStats.pool.addresses[0] }}
@@ -67,13 +67,13 @@ [attr.aria-expanded]="!gfg" aria-controls="collapseExample"> Show all ({{ poolStats.pool.addresses.length }}) - - {{ poolStats.pool.addresses[0] | shortenString: 40 }} + + {{ poolStats.pool.addresses[0] | shortenString: 30 }}
- {{ - address | shortenString: 40 }}
 + address | shortenString: 30 }}
Hashrate (24h) - - - + + + - - - - - + + +
EstimatedReportedLuckRewardHashrate (24h)Avg Health
{{ poolStats.estimatedHashrate | amountShortener : 1 : 'H/s' }}{{ poolStats.reportedHashrate | amountShortener : 1 : 'H/s' }}{{ formatNumber(poolStats.luck, this.locale, '1.2-2') }}%{{ poolStats.estimatedHashrate | amountShortener : 1 : 'H/s' }}{{ poolStats.avgBlockHealth }}% + + Unknown + +
- Hashrate (24h) - - - + + + - - - - - + + +
EstimatedReportedLuckRewardHashrate (24h)Avg Health
{{ poolStats.estimatedHashrate | amountShortener : 1 : 'H/s' }}{{ poolStats.reportedHashrate | amountShortener : 1 : 'H/s' }}{{ formatNumber(poolStats.luck, this.locale, '1.2-2') }}%{{ poolStats.estimatedHashrate | amountShortener : 1 : 'H/s' }}{{ poolStats.avgBlockHealth }}% + + Unknown + +
~~
Mined blocks - - - + + + - - -
24h1wAllBlocks 24h1wAll
{{ formatNumber(poolStats.blockCount['24h'], this.locale, '1.0-0') }} ({{ formatNumber(100 * + {{ formatNumber(poolStats.blockCount['24h'], this.locale, '1.0-0') }} ({{ formatNumber(100 * poolStats.blockShare['24h'], this.locale, '1.0-0') }}%){{ formatNumber(poolStats.blockCount['1w'], this.locale, '1.0-0') }} ({{ formatNumber(100 * + {{ formatNumber(poolStats.blockCount['1w'], this.locale, '1.0-0') }} ({{ formatNumber(100 * poolStats.blockShare['1w'], this.locale, '1.0-0') }}%){{ formatNumber(poolStats.blockCount['all'], this.locale, '1.0-0') }} ({{ formatNumber(100 * + {{ formatNumber(poolStats.blockCount['all'], this.locale, '1.0-0') }} ({{ formatNumber(100 * poolStats.blockShare['all'], this.locale, '1.0-0') }}%)
@@ -162,21 +162,20 @@
- Mined blocks - - - + + + - - -
24h1wAllBlocks 24h1wAll
{{ formatNumber(poolStats.blockCount['24h'], this.locale, '1.0-0') }} ({{ formatNumber(100 * + {{ formatNumber(poolStats.blockCount['24h'], this.locale, '1.0-0') }} ({{ formatNumber(100 * poolStats.blockShare['24h'], this.locale, '1.0-0') }}%){{ formatNumber(poolStats.blockCount['1w'], this.locale, '1.0-0') }} ({{ formatNumber(100 * + {{ formatNumber(poolStats.blockCount['1w'], this.locale, '1.0-0') }} ({{ formatNumber(100 * poolStats.blockShare['1w'], this.locale, '1.0-0') }}%){{ formatNumber(poolStats.blockCount['all'], this.locale, '1.0-0') }} ({{ formatNumber(100 * + {{ formatNumber(poolStats.blockCount['all'], this.locale, '1.0-0') }} ({{ formatNumber(100 * poolStats.blockShare['all'], this.locale, '1.0-0') }}%)
@@ -213,8 +212,9 @@ 		Timestamp Mined Coinbase tagHealth RewardFeesFees TXs Size + {{ block.extras.matchRate }}% + + Unknown + + + diff --git a/frontend/src/app/components/pool/pool.component.scss b/frontend/src/app/components/pool/pool.component.scss index 9103f38f5..21468773f 100644 --- a/frontend/src/app/components/pool/pool.component.scss +++ b/frontend/src/app/components/pool/pool.component.scss @@ -68,6 +68,11 @@ div.scrollable { vertical-align: top; padding-top: 25px; } +.addresses-data { + vertical-align: top; + font-family: monospace; + font-size: 14px; +} .data { text-align: right; @@ -100,7 +105,7 @@ div.scrollable { @media (max-width: 875px) { padding-left: 50px; } - @media (max-width: 650px) { + @media (max-width: 685px) { display: none; } } @@ -118,7 +123,7 @@ div.scrollable { padding-right: 10px; } @media (max-width: 875px) { - padding-right: 50px; + padding-right: 20px; } @media (max-width: 567px) { padding-right: 10px; @@ -186,10 +191,6 @@ div.scrollable { .block-count-title { color: #4a68b9; font-size: 14px; - text-align: left; - @media (max-width: 767.98px) { - text-align: center; - } } .table-data tr { diff --git a/frontend/src/app/components/pool/pool.component.ts b/frontend/src/app/components/pool/pool.component.ts index 56b8bd392..85fd028ef 100644 --- a/frontend/src/app/components/pool/pool.component.ts +++ b/frontend/src/app/components/pool/pool.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Inject, Input, LOCALE_ID, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { EChartsOption, graphic } from 'echarts'; -import { BehaviorSubject, Observable, timer } from 'rxjs'; +import { BehaviorSubject, Observable } from 'rxjs'; import { distinctUntilChanged, map, share, switchMap, tap } from 'rxjs/operators'; import { BlockExtended, PoolStat } from '../../interfaces/node-api.interface'; import { ApiService } from '../../services/api.service'; @@ -35,6 +35,8 @@ export class PoolComponent implements OnInit { blocks: BlockExtended[] = []; slug: string = undefined; + auditAvailable = false; + loadMoreSubject: BehaviorSubject = new BehaviorSubject(this.blocks[this.blocks.length - 1]?.height); constructor( @@ -44,6 +46,7 @@ export class PoolComponent implements OnInit { public stateService: StateService, private seoService: SeoService, ) { + this.auditAvailable = this.stateService.env.AUDIT; } ngOnInit(): void { @@ -74,11 +77,6 @@ export class PoolComponent implements OnInit { regexes += regex + '", "'; } poolStats.pool.regexes = regexes.slice(0, -3); - poolStats.pool.addresses = poolStats.pool.addresses; - - if (poolStats.reportedHashrate) { - poolStats.luck = poolStats.estimatedHashrate / poolStats.reportedHashrate * 100; - } return Object.assign({ logo: `/resources/mining-pools/` + poolStats.pool.name.toLowerCase().replace(' ', '').replace('.', '') + '.svg' diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts index cad623f9f..8d8f30863 100644 --- a/frontend/src/app/interfaces/node-api.interface.ts +++ b/frontend/src/app/interfaces/node-api.interface.ts @@ -107,8 +107,8 @@ export interface PoolStat { '1w': number, }; estimatedHashrate: number; - reportedHashrate: number; - luck?: number; + avgBlockHealth: number; + totalReward: number; } export interface BlockExtension { From 4a64c0dfa509078409e828dafab000cf4462382f Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Thu, 16 Mar 2023 16:35:59 +0900 Subject: [PATCH 23/60] Fix skeleton --- .../app/components/pool/pool.component.html | 54 +++++++++---------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/frontend/src/app/components/pool/pool.component.html b/frontend/src/app/components/pool/pool.component.html index d7c791db9..aa54b70f5 100644 --- a/frontend/src/app/components/pool/pool.component.html +++ b/frontend/src/app/components/pool/pool.component.html @@ -37,7 +37,7 @@
Addresses + {{ poolStats.pool.addresses[0] }} @@ -378,24 +378,23 @@
Hashrate (24h) - - - + + + - - - @@ -405,23 +404,22 @@
EstimatedReportedLuckRewardHashrate (24h)Avg Health
+
+
+
- Hashrate (24h) - - - + + + - - - @@ -431,24 +429,23 @@ -
EstimatedReportedLuckRewardHashrate (24h)Avg Health
+
+
+
Mined blocks - - - + + + - - - @@ -458,23 +455,22 @@
24h1wAllBlocks 24h1wAll
+
+
+
- Mined blocks - - - + + + - - - From 64ab14f99510281f8cfd0a67bc322168daaebbfd Mon Sep 17 00:00:00 2001 From: Mononaut Date: Mon, 13 Mar 2023 18:10:49 +0900 Subject: [PATCH 24/60] mempool block entry animation --- .../mempool-blocks.component.html | 2 +- .../mempool-blocks.component.ts | 37 +++++++++++++++++-- .../src/app/interfaces/websocket.interface.ts | 1 + 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html index 692f7d863..58d555657 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html @@ -2,7 +2,7 @@
-
+
 
diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts index 8a0a06f0c..1dc280514 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts @@ -1,5 +1,5 @@ -import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef, Input } from '@angular/core'; -import { Subscription, Observable, fromEvent, merge, of, combineLatest, timer } from 'rxjs'; +import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'; +import { Subscription, Observable, fromEvent, merge, of, combineLatest } from 'rxjs'; import { MempoolBlock } from '../../interfaces/websocket.interface'; import { StateService } from '../../services/state.service'; import { Router } from '@angular/router'; @@ -9,11 +9,18 @@ import { specialBlocks } from '../../app.constants'; import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe'; import { Location } from '@angular/common'; import { DifficultyAdjustment } from '../../interfaces/node-api.interface'; +import { animate, style, transition, trigger } from '@angular/animations'; @Component({ selector: 'app-mempool-blocks', templateUrl: './mempool-blocks.component.html', styleUrls: ['./mempool-blocks.component.scss'], + animations: [trigger('blockEntryTrigger', [ + transition(':enter', [ + style({ transform: 'translateX(-155px)' }), + animate('2s 0s ease', style({ transform: '' })), + ]), + ])], changeDetection: ChangeDetectionStrategy.OnPush, }) export class MempoolBlocksComponent implements OnInit, OnDestroy { @@ -32,12 +39,14 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { isLoadingWebsocketSubscription: Subscription; blockSubscription: Subscription; networkSubscription: Subscription; + chainTipSubscription: Subscription; network = ''; now = new Date().getTime(); timeOffset = 0; showMiningInfo = false; timeLtrSubscription: Subscription; timeLtr: boolean; + animateEntry: boolean = false; blockWidth = 125; blockPadding = 30; @@ -53,6 +62,7 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { resetTransitionTimeout: number; + chainTip: number = -1; blockIndex = 1; constructor( @@ -69,6 +79,8 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { } ngOnInit() { + this.chainTip = this.stateService.latestBlockHeight; + if (['', 'testnet', 'signet'].includes(this.stateService.network)) { this.enabledMiningInfoIfNeeded(this.location.path()); this.location.onUrlChange((url) => this.enabledMiningInfoIfNeeded(url)); @@ -155,11 +167,24 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { this.blockSubscription = this.stateService.blocks$ .subscribe(([block]) => { + if (this.chainTip === -1) { + this.animateEntry = block.height === this.stateService.latestBlockHeight; + } else { + this.animateEntry = block.height > this.chainTip; + } + + this.chainTip = this.stateService.latestBlockHeight; if (block?.extras?.matchRate >= 66 && !this.tabHidden) { this.blockIndex++; } }); + this.chainTipSubscription = this.stateService.chainTip$.subscribe((height) => { + if (this.chainTip === -1) { + this.chainTip = height; + } + }); + this.networkSubscription = this.stateService.networkChanged$ .subscribe((network) => this.network = network); @@ -195,11 +220,12 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { this.blockSubscription.unsubscribe(); this.networkSubscription.unsubscribe(); this.timeLtrSubscription.unsubscribe(); + this.chainTipSubscription.unsubscribe(); clearTimeout(this.resetTransitionTimeout); } trackByFn(index: number, block: MempoolBlock) { - return block.index; + return (block.isStack) ? 'stack' : block.height; } reduceMempoolBlocksToFitScreen(blocks: MempoolBlock[]): MempoolBlock[] { @@ -216,6 +242,9 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { lastBlock.medianFee = this.median(lastBlock.feeRange); lastBlock.totalFees += block.totalFees; } + if (blocks.length) { + blocks[blocks.length - 1].isStack = blocks[blocks.length - 1].blockVSize > this.stateService.blockVSize; + } return blocks; } @@ -334,4 +363,4 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { } return emptyBlocks; } -} +} \ No newline at end of file diff --git a/frontend/src/app/interfaces/websocket.interface.ts b/frontend/src/app/interfaces/websocket.interface.ts index 96f7530c9..46416857e 100644 --- a/frontend/src/app/interfaces/websocket.interface.ts +++ b/frontend/src/app/interfaces/websocket.interface.ts @@ -43,6 +43,7 @@ export interface MempoolBlock { totalFees: number; feeRange: number[]; index: number; + isStack?: boolean; } export interface MempoolBlockWithTransactions extends MempoolBlock { From c24724dcdfa7429c1e6437387121057ffa67f862 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Tue, 14 Mar 2023 10:19:32 +0900 Subject: [PATCH 25/60] animate mempool blocks conditional on mined block similarity --- backend/src/api/audit.ts | 15 ++++++++++++--- backend/src/api/websocket-handler.ts | 3 ++- backend/src/mempool.interfaces.ts | 1 + .../mempool-blocks/mempool-blocks.component.ts | 4 ++-- frontend/src/app/interfaces/node-api.interface.ts | 1 + 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/backend/src/api/audit.ts b/backend/src/api/audit.ts index 5b67dc965..d0d677740 100644 --- a/backend/src/api/audit.ts +++ b/backend/src/api/audit.ts @@ -5,9 +5,9 @@ const PROPAGATION_MARGIN = 180; // in seconds, time since a transaction is first class Audit { auditBlock(transactions: TransactionExtended[], projectedBlocks: MempoolBlockWithTransactions[], mempool: { [txId: string]: TransactionExtended }) - : { censored: string[], added: string[], fresh: string[], score: number } { + : { censored: string[], added: string[], fresh: string[], score: number, similarity: number } { if (!projectedBlocks?.[0]?.transactionIds || !mempool) { - return { censored: [], added: [], fresh: [], score: 0 }; + return { censored: [], added: [], fresh: [], score: 0, similarity: 1 }; } const matches: string[] = []; // present in both mined block and template @@ -16,6 +16,8 @@ class Audit { const isCensored = {}; // missing, without excuse const isDisplaced = {}; let displacedWeight = 0; + let matchedWeight = 0; + let projectedWeight = 0; const inBlock = {}; const inTemplate = {}; @@ -38,11 +40,16 @@ class Audit { isCensored[txid] = true; } displacedWeight += mempool[txid].weight; + } else { + matchedWeight += mempool[txid].weight; } + projectedWeight += mempool[txid].weight; inTemplate[txid] = true; } displacedWeight += (4000 - transactions[0].weight); + projectedWeight += transactions[0].weight; + matchedWeight += transactions[0].weight; // we can expect an honest miner to include 'displaced' transactions in place of recent arrivals and censored txs // these displaced transactions should occupy the first N weight units of the next projected block @@ -121,12 +128,14 @@ class Audit { const numCensored = Object.keys(isCensored).length; const numMatches = matches.length - 1; // adjust for coinbase tx const score = numMatches > 0 ? (numMatches / (numMatches + numCensored)) : 0; + const similarity = projectedWeight ? matchedWeight / projectedWeight : 1; return { censored: Object.keys(isCensored), added, fresh, - score + score, + similarity, }; } } diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index a96264825..1eeb17d2e 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -432,7 +432,7 @@ class WebsocketHandler { } if (Common.indexingEnabled() && memPool.isInSync()) { - const { censored, added, fresh, score } = Audit.auditBlock(transactions, projectedBlocks, auditMempool); + const { censored, added, fresh, score, similarity } = Audit.auditBlock(transactions, projectedBlocks, auditMempool); const matchRate = Math.round(score * 100 * 100) / 100; const stripped = projectedBlocks[0]?.transactions ? projectedBlocks[0].transactions.map((tx) => { @@ -464,6 +464,7 @@ class WebsocketHandler { if (block.extras) { block.extras.matchRate = matchRate; + block.extras.similarity = similarity; } } } diff --git a/backend/src/mempool.interfaces.ts b/backend/src/mempool.interfaces.ts index 8662770bc..9961632c3 100644 --- a/backend/src/mempool.interfaces.ts +++ b/backend/src/mempool.interfaces.ts @@ -153,6 +153,7 @@ export interface BlockExtension { feeRange: number[]; // fee rate percentiles reward: number; matchRate: number | null; + similarity?: number; pool: { id: number; // Note - This is the `unique_id`, not to mix with the auto increment `id` name: string; diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts index 1dc280514..84b2b7bc0 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts @@ -174,7 +174,7 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { } this.chainTip = this.stateService.latestBlockHeight; - if (block?.extras?.matchRate >= 66 && !this.tabHidden) { + if ((block?.extras?.similarity == null || block?.extras?.similarity > 0.5) && !this.tabHidden) { this.blockIndex++; } }); @@ -225,7 +225,7 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { } trackByFn(index: number, block: MempoolBlock) { - return (block.isStack) ? 'stack' : block.height; + return (block.isStack) ? 'stack' : block.index; } reduceMempoolBlocksToFitScreen(blocks: MempoolBlock[]): MempoolBlock[] { diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts index cad623f9f..024376ca6 100644 --- a/frontend/src/app/interfaces/node-api.interface.ts +++ b/frontend/src/app/interfaces/node-api.interface.ts @@ -118,6 +118,7 @@ export interface BlockExtension { reward?: number; coinbaseRaw?: string; matchRate?: number; + similarity?: number; pool?: { id: number; name: string; From 25aacb504687539bd7df93c6ee22bfb3d057e832 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Tue, 14 Mar 2023 14:52:34 +0900 Subject: [PATCH 26/60] Calculate similarity score with audit disabled --- backend/src/api/common.ts | 26 +++++++++++++++++++++++++- backend/src/api/websocket-handler.ts | 3 +++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/backend/src/api/common.ts b/backend/src/api/common.ts index f762cfc2c..df97c0292 100644 --- a/backend/src/api/common.ts +++ b/backend/src/api/common.ts @@ -1,4 +1,4 @@ -import { CpfpInfo, TransactionExtended, TransactionStripped } from '../mempool.interfaces'; +import { CpfpInfo, MempoolBlockWithTransactions, TransactionExtended, TransactionStripped } from '../mempool.interfaces'; import config from '../config'; import { NodeSocket } from '../repositories/NodesSocketsRepository'; import { isIP } from 'net'; @@ -164,6 +164,30 @@ export class Common { return parents; } + // calculates the ratio of matched transactions to projected transactions by weight + static getSimilarity(projectedBlock: MempoolBlockWithTransactions, transactions: TransactionExtended[]): number { + let matchedWeight = 0; + let projectedWeight = 0; + const inBlock = {}; + + for (const tx of transactions) { + inBlock[tx.txid] = tx; + } + + // look for transactions that were expected in the template, but missing from the mined block + for (const tx of projectedBlock.transactions) { + if (inBlock[tx.txid]) { + matchedWeight += tx.vsize * 4; + } + projectedWeight += tx.vsize * 4; + } + + projectedWeight += transactions[0].weight; + matchedWeight += transactions[0].weight; + + return projectedWeight ? matchedWeight / projectedWeight : 1; + } + static getSqlInterval(interval: string | null): string | null { switch (interval) { case '24h': return '1 DAY'; diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index 1eeb17d2e..07aac0790 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -467,6 +467,9 @@ class WebsocketHandler { block.extras.similarity = similarity; } } + } else if (block.extras) { + const mBlocks = mempoolBlocks.getMempoolBlocksWithTransactions(); + block.extras.similarity = Common.getSimilarity(mBlocks[0], transactions); } const removed: string[] = []; From b5c20734141cd9825b4b082e63cd125cd507b563 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Thu, 16 Mar 2023 22:15:20 +0900 Subject: [PATCH 27/60] Fix getSimilarity error on empty mempool --- backend/src/api/websocket-handler.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index 07aac0790..c89179ce7 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -469,7 +469,9 @@ class WebsocketHandler { } } else if (block.extras) { const mBlocks = mempoolBlocks.getMempoolBlocksWithTransactions(); - block.extras.similarity = Common.getSimilarity(mBlocks[0], transactions); + if (mBlocks?.length && mBlocks[0].transactions) { + block.extras.similarity = Common.getSimilarity(mBlocks[0], transactions); + } } const removed: string[] = []; From b8f77c4be40dd7f4ba80a4ab4f83556c9535e2de Mon Sep 17 00:00:00 2001 From: softsimon Date: Fri, 17 Mar 2023 14:01:36 +0900 Subject: [PATCH 28/60] Pull from transifex --- frontend/src/locale/messages.ca.xlf | 1326 ++++++++++++++++---------- frontend/src/locale/messages.es.xlf | 26 +- frontend/src/locale/messages.fr.xlf | 28 +- frontend/src/locale/messages.hi.xlf | 1329 +++++++++++++++++---------- frontend/src/locale/messages.hr.xlf | 1324 ++++++++++++++++---------- frontend/src/locale/messages.it.xlf | 172 ++++ frontend/src/locale/messages.ko.xlf | 42 +- frontend/src/locale/messages.sv.xlf | 70 +- frontend/src/locale/messages.th.xlf | 45 + frontend/src/locale/messages.uk.xlf | 42 +- frontend/src/locale/messages.zh.xlf | 2 + 11 files changed, 2839 insertions(+), 1567 deletions(-) diff --git a/frontend/src/locale/messages.ca.xlf b/frontend/src/locale/messages.ca.xlf index 50d44b541..48d9623ac 100644 --- a/frontend/src/locale/messages.ca.xlf +++ b/frontend/src/locale/messages.ca.xlf @@ -354,11 +354,11 @@ src/app/components/block/block.component.html - 290,291 + 310,311 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 26,27 + 46,47 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -378,11 +378,11 @@ src/app/components/block/block.component.html - 291,292 + 311,312 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 27,28 + 47,48 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -418,7 +418,7 @@ src/app/components/block/block.component.html - 40,41 + 38,39 block.hash @@ -443,7 +443,7 @@ src/app/components/block/block.component.html - 44,46 + 42,44 src/app/components/blocks-list/blocks-list.component.html @@ -585,11 +585,11 @@ src/app/components/master-page/master-page.component.html - 49,51 + 48,50 src/app/components/pool-ranking/pool-ranking.component.html - 94,96 + 94,95 @@ -740,11 +740,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -765,16 +765,24 @@ src/app/components/about/about.component.html - 385,389 + 391,394 + + + src/app/components/mining-dashboard/mining-dashboard.component.html + 87 src/app/dashboard/dashboard.component.html - 150,152 + 157,159 src/app/docs/docs/docs.component.html 51 + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 97 + Terms of Service shared.terms-of-service @@ -784,14 +792,22 @@ src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html 113,120 + + src/app/components/mining-dashboard/mining-dashboard.component.html + 89 + src/app/dashboard/dashboard.component.html - 152,154 + 159,161 src/app/docs/docs/docs.component.html 53 + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 99 + Privacy Policy shared.privacy-policy @@ -978,7 +994,7 @@ src/app/dashboard/dashboard.component.html - 124,125 + 124,126 @@ -1026,7 +1042,7 @@ src/app/components/transaction/transaction.component.html - 158,160 + 152,154 src/app/components/transactions-list/transactions-list.component.html @@ -1042,11 +1058,11 @@ src/app/components/block/block.component.html - 246,247 + 252,253 src/app/components/transaction/transaction.component.html - 288,290 + 283,285 transaction.version @@ -1095,7 +1111,7 @@ src/app/components/transactions-list/transactions-list.component.html - 294,295 + 296,297 Transaction singular confirmation count shared.confirmation-count.singular @@ -1116,7 +1132,7 @@ src/app/components/transactions-list/transactions-list.component.html - 295,296 + 297,298 Transaction plural confirmation count shared.confirmation-count.plural @@ -1128,10 +1144,6 @@ src/app/bisq/bisq-transaction/bisq-transaction.component.html 43,45 - - src/app/components/transaction/transaction.component.html - 65,67 - Transaction included in block transaction.included-in-block @@ -1144,11 +1156,11 @@ src/app/components/transaction/transaction.component.html - 77,80 + 71,74 src/app/components/transaction/transaction.component.html - 135,138 + 129,132 Transaction features transaction.features @@ -1176,11 +1188,11 @@ src/app/components/transaction/transaction.component.html - 262,267 + 257,262 src/app/components/transaction/transaction.component.html - 406,412 + 401,407 transaction.details @@ -1197,11 +1209,11 @@ src/app/components/transaction/transaction.component.html - 249,253 + 244,248 src/app/components/transaction/transaction.component.html - 377,383 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1218,7 +1230,7 @@ src/app/components/transaction/transaction.component.ts - 241,240 + 246,245 @@ -1238,7 +1250,7 @@ src/app/components/transaction/transaction.component.html - 159,160 + 153,154 src/app/dashboard/dashboard.component.html @@ -1254,7 +1266,7 @@ src/app/components/transaction/transaction.component.html - 72,73 + 66,67 Transaction Confirmed state transaction.confirmed @@ -1422,7 +1434,7 @@ Our mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, completely self-hosted without any trusted third-parties. src/app/components/about/about.component.html - 13,17 + 13,16 @@ -1430,7 +1442,7 @@ Empreses patrocinadores 🚀 src/app/components/about/about.component.html - 29,32 + 19,22 about.sponsors.enterprise.withRocket @@ -1439,7 +1451,7 @@ Patrocinadors de la comunitat ❤️ src/app/components/about/about.component.html - 177,180 + 167,170 about.sponsors.withHeart @@ -1447,7 +1459,7 @@ Community Integrations src/app/components/about/about.component.html - 191,193 + 181,183 about.community-integrations @@ -1455,7 +1467,7 @@ Community Alliances src/app/components/about/about.component.html - 285,287 + 291,293 about.alliances @@ -1463,7 +1475,7 @@ Project Translators src/app/components/about/about.component.html - 301,303 + 307,309 about.translators @@ -1472,7 +1484,7 @@ Col·laboradors del projecte src/app/components/about/about.component.html - 315,317 + 321,323 about.contributors @@ -1480,7 +1492,7 @@ Project Members src/app/components/about/about.component.html - 327,329 + 333,335 about.project_members @@ -1489,7 +1501,7 @@ Mantenidors del projecte src/app/components/about/about.component.html - 340,342 + 346,348 about.maintainers @@ -1498,7 +1510,7 @@ Sobre src/app/components/about/about.component.ts - 39 + 42 src/app/components/bisq-master-page/bisq-master-page.component.html @@ -1510,7 +1522,7 @@ src/app/components/master-page/master-page.component.html - 58,61 + 57,60 @@ -1545,7 +1557,7 @@ src/app/components/amount/amount.component.html - 6,9 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -1561,7 +1573,7 @@ src/app/components/transactions-list/transactions-list.component.html - 302,304 + 304,306 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -1640,7 +1652,7 @@ src/app/components/assets/assets.component.html - 29,31 + 31,33 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -1847,7 +1859,7 @@ src/app/components/assets/assets.component.html - 30,31 + 32,33 Asset ticker header @@ -1860,7 +1872,7 @@ src/app/components/assets/assets.component.html - 31,34 + 33,36 Asset Issuer Domain header @@ -1873,7 +1885,7 @@ src/app/components/assets/assets.component.html - 32,36 + 34,38 Asset ID header @@ -1882,7 +1894,7 @@ Error al carregar les dades dels actius. src/app/components/assets/assets.component.html - 48,53 + 50,55 Asset data load error @@ -1987,7 +1999,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2003,7 +2015,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 161 + 165 @@ -2018,7 +2030,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 163 + 167 @@ -2029,11 +2041,11 @@ src/app/components/block-fees-graph/block-fees-graph.component.ts - 62 + 67 src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2041,19 +2053,19 @@ Indexing blocks src/app/components/block-fees-graph/block-fees-graph.component.ts - 110,105 + 116,111 src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 108,103 + 113,108 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 115,110 + 116,111 src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2093,7 +2105,7 @@ src/app/components/transaction/transaction.component.html - 476 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2119,11 +2131,11 @@ src/app/components/transaction/transaction.component.html - 476,477 + 473 src/app/components/transactions-list/transactions-list.component.html - 286,287 + 288 sat shared.sat @@ -2137,11 +2149,11 @@ src/app/components/transaction/transaction.component.html - 161,165 + 155,159 src/app/components/transaction/transaction.component.html - 479,481 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2153,7 +2165,7 @@ src/app/lightning/channels-list/channels-list.component.html - 38,39 + 41,43 Transaction fee rate transaction.fee-rate @@ -2171,19 +2183,19 @@ src/app/components/block/block.component.html - 125,128 + 124,127 src/app/components/block/block.component.html - 129 + 128,130 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 12,14 + 19,22 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 15,17 + 30,33 src/app/components/fees-box/fees-box.component.html @@ -2223,27 +2235,27 @@ src/app/components/transaction/transaction.component.html - 173,174 + 167,168 src/app/components/transaction/transaction.component.html - 184,185 + 178,179 src/app/components/transaction/transaction.component.html - 195,196 + 189,190 src/app/components/transaction/transaction.component.html - 481,484 + 478,481 src/app/components/transaction/transaction.component.html - 492,494 + 489,491 src/app/components/transactions-list/transactions-list.component.html - 286 + 286,287 src/app/dashboard/dashboard.component.html @@ -2251,7 +2263,7 @@ src/app/dashboard/dashboard.component.html - 204,208 + 213,217 sat/vB shared.sat-vbyte @@ -2265,11 +2277,11 @@ src/app/components/transaction/transaction.component.html - 160,162 + 154,156 src/app/components/transaction/transaction.component.html - 274,277 + 269,272 Transaction Virtual Size transaction.vsize @@ -2338,7 +2350,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2372,11 +2384,11 @@ src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 60 + 65 src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2392,7 +2404,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2401,15 +2413,15 @@ Mida src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 180,179 + 184,183 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 226,224 + 239,237 src/app/components/block/block.component.html - 50,52 + 48,50 src/app/components/blocks-list/blocks-list.component.html @@ -2433,7 +2445,7 @@ src/app/components/transaction/transaction.component.html - 270,272 + 265,267 src/app/dashboard/dashboard.component.html @@ -2445,11 +2457,11 @@ Pes src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 188,187 + 192,191 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 257,254 + 270,267 src/app/components/block/block-preview.component.html @@ -2457,11 +2469,22 @@ src/app/components/block/block.component.html - 54,56 + 52,54 src/app/components/transaction/transaction.component.html - 278,280 + 273,275 + + + + Size per weight + + src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts + 200,199 + + + src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts + 282,279 @@ -2476,14 +2499,6 @@ shared.block-title - - - - src/app/components/block/block-preview.component.html - 11,12 - - shared.block-title - Median fee Quota mediana @@ -2493,7 +2508,7 @@ src/app/components/block/block.component.html - 128,129 + 127,128 src/app/components/mempool-block/mempool-block.component.html @@ -2510,11 +2525,11 @@ src/app/components/block/block.component.html - 133,135 + 138,140 src/app/components/block/block.component.html - 159,162 + 164,167 src/app/components/mempool-block/mempool-block.component.html @@ -2532,7 +2547,7 @@ src/app/components/block/block.component.html - 168,170 + 173,175 block.miner @@ -2544,7 +2559,7 @@ src/app/components/block/block.component.ts - 227 + 242 @@ -2553,6 +2568,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2567,31 +2586,47 @@ Previous Block - - Block health + + Health src/app/components/block/block.component.html - 58,61 + 56 - block.health + + src/app/components/blocks-list/blocks-list.component.html + 18,19 + + + src/app/components/blocks-list/blocks-list.component.html + 18,19 + + latest-blocks.health Unknown src/app/components/block/block.component.html - 69,72 + 67,70 src/app/components/blocks-list/blocks-list.component.html 60,63 - src/app/lightning/node/node.component.html - 52,55 + src/app/components/pool-ranking/pool-ranking.component.html + 121,124 + + + src/app/lightning/channel/closing-type/closing-type.component.ts + 32 src/app/lightning/node/node.component.html - 96,100 + 55,58 + + + src/app/lightning/node/node.component.html + 99,103 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts @@ -2608,7 +2643,7 @@ Rang de quotes src/app/components/block/block.component.html - 124,125 + 123,124 src/app/components/mempool-block/mempool-block.component.html @@ -2620,7 +2655,7 @@ Based on average native segwit transaction of 140 vBytes src/app/components/block/block.component.html - 129,131 + 131,136 src/app/components/fees-box/fees-box.component.html @@ -2644,49 +2679,60 @@ Transaction fee tooltip - - Subsidy + fees: - Subvenció + Quota + + Subsidy + fees src/app/components/block/block.component.html - 148,151 + 153,156 src/app/components/block/block.component.html - 163,167 + 168,172 Total subsidy and fees in a block block.subsidy-and-fees - - Projected + + Expected src/app/components/block/block.component.html - 210,212 + 216 - block.projected + block.expected + + + beta + + src/app/components/block/block.component.html + 216,217 + + + src/app/components/block/block.component.html + 222,224 + + beta Actual src/app/components/block/block.component.html - 212,216 + 218,222 block.actual - - Projected Block + + Expected Block src/app/components/block/block.component.html - 216,218 + 222 - block.projected-block + block.expected-block Actual Block src/app/components/block/block.component.html - 225,227 + 231 block.actual-block @@ -2695,7 +2741,7 @@ Bits src/app/components/block/block.component.html - 250,252 + 256,258 block.bits @@ -2703,7 +2749,7 @@ Merkle root src/app/components/block/block.component.html - 254,256 + 260,262 block.merkle-root @@ -2712,7 +2758,7 @@ Dificultat src/app/components/block/block.component.html - 265,268 + 271,274 src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html @@ -2728,11 +2774,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2740,7 +2786,7 @@ Nonce src/app/components/block/block.component.html - 269,271 + 275,277 block.nonce @@ -2748,32 +2794,41 @@ Block Header Hex src/app/components/block/block.component.html - 273,274 + 279,280 block.header + + Audit + + src/app/components/block/block.component.html + 297,301 + + Toggle Audit + block.toggle-audit + Details Detalls src/app/components/block/block.component.html - 284,288 + 304,308 src/app/components/transaction/transaction.component.html - 254,259 + 249,254 src/app/lightning/channel/channel.component.html - 86,88 + 93,95 src/app/lightning/channel/channel.component.html - 96,98 + 103,105 src/app/lightning/node/node.component.html - 218,222 + 221,225 Transaction Details transaction.details @@ -2782,20 +2837,16 @@ Error loading data. src/app/components/block/block.component.html - 303,305 + 323,325 src/app/components/block/block.component.html - 339,343 + 362,366 src/app/lightning/channel/channel-preview.component.html 70,75 - - src/app/lightning/channel/channel.component.html - 109,115 - src/app/lightning/node/node-preview.component.html 66,69 @@ -2810,7 +2861,7 @@ Why is this block empty? src/app/components/block/block.component.html - 361,367 + 384,390 block.empty-block-explanation @@ -2855,18 +2906,6 @@ latest-blocks.mined - - Health - - src/app/components/blocks-list/blocks-list.component.html - 18,19 - - - src/app/components/blocks-list/blocks-list.component.html - 18,19 - - latest-blocks.health - Reward @@ -2928,7 +2967,7 @@ src/app/dashboard/dashboard.component.html - 210,214 + 219,223 dashboard.txs @@ -2959,13 +2998,17 @@ Difficulty Adjustment Canvi de dificultat + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -2973,11 +3016,11 @@ Remaining Restant - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -2985,11 +3028,11 @@ blocks - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3009,11 +3052,11 @@ block - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3025,11 +3068,11 @@ Estimate - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3037,19 +3080,23 @@ Previous - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3057,11 +3104,99 @@ Next Halving - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) @@ -3151,7 +3286,7 @@ src/app/dashboard/dashboard.component.html - 237,238 + 246,247 dashboard.incoming-transactions @@ -3163,7 +3298,7 @@ src/app/dashboard/dashboard.component.html - 240,243 + 249,252 dashboard.backend-is-synchronizing @@ -3176,7 +3311,7 @@ src/app/dashboard/dashboard.component.html - 245,250 + 254,259 vB/s shared.vbytes-per-second @@ -3189,7 +3324,7 @@ src/app/dashboard/dashboard.component.html - 208,209 + 217,218 Unconfirmed count dashboard.unconfirmed @@ -3208,7 +3343,7 @@ Mining src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3216,7 +3351,7 @@ Pools Ranking src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3228,7 +3363,7 @@ Pools Dominance src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3240,7 +3375,7 @@ Hashrate & Difficulty src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3248,7 +3383,7 @@ Lightning src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3256,7 +3391,7 @@ Lightning Nodes Per Network src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3276,7 +3411,7 @@ Lightning Network Capacity src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3296,7 +3431,7 @@ Lightning Nodes Per ISP src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3308,7 +3443,7 @@ Lightning Nodes Per Country src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3324,7 +3459,7 @@ Lightning Nodes World Map src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3340,7 +3475,7 @@ Lightning Nodes Channels World Map src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3360,11 +3495,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3392,11 +3527,11 @@ Hashrate (MA) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3429,7 +3564,7 @@ src/app/components/master-page/master-page.component.html - 52,54 + 51,53 src/app/components/statistics/statistics.component.ts @@ -3453,7 +3588,7 @@ Lightning Explorer src/app/components/master-page/master-page.component.html - 44,45 + 44,47 src/app/lightning/lightning-dashboard/lightning-dashboard.component.ts @@ -3461,19 +3596,11 @@ master-page.lightning - - beta - - src/app/components/master-page/master-page.component.html - 45,48 - - beta - Documentation src/app/components/master-page/master-page.component.html - 55,57 + 54,56 src/app/docs/docs/docs.component.html @@ -3513,7 +3640,7 @@ Reward stats src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3521,7 +3648,7 @@ (144 blocks) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3530,7 +3657,7 @@ Últims blocs src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3542,10 +3669,35 @@ Adjustments src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments + + Broadcast Transaction + + src/app/components/mining-dashboard/mining-dashboard.component.html + 91 + + + src/app/components/push-transaction/push-transaction.component.html + 2 + + + src/app/components/push-transaction/push-transaction.component.html + 8 + + + src/app/dashboard/dashboard.component.html + 161,169 + + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 102 + + Broadcast Transaction + shared.broadcast-transaction + Pools luck (1 week) @@ -3606,7 +3758,7 @@ src/app/components/pool-ranking/pool-ranking.component.html - 136,138 + 152,154 master-page.blocks @@ -3634,11 +3786,23 @@ mining.rank + + Avg Health + + src/app/components/pool-ranking/pool-ranking.component.html + 96,97 + + + src/app/components/pool-ranking/pool-ranking.component.html + 96,98 + + latest-blocks.avg_health + Empty blocks src/app/components/pool-ranking/pool-ranking.component.html - 95,98 + 97,100 mining.empty-blocks @@ -3646,7 +3810,7 @@ All miners src/app/components/pool-ranking/pool-ranking.component.html - 113,114 + 129,130 mining.all-miners @@ -3654,7 +3818,7 @@ Pools Luck (1w) src/app/components/pool-ranking/pool-ranking.component.html - 130,132 + 146,148 mining.miners-luck @@ -3662,7 +3826,7 @@ Pools Count (1w) src/app/components/pool-ranking/pool-ranking.component.html - 142,144 + 158,160 mining.miners-count @@ -3670,11 +3834,11 @@ Mining Pools src/app/components/pool-ranking/pool-ranking.component.ts - 57 + 58 - - blocks + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3683,6 +3847,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -3884,23 +4083,6 @@ latest-blocks.coinbasetag - - Broadcast Transaction - - src/app/components/push-transaction/push-transaction.component.html - 2 - - - src/app/components/push-transaction/push-transaction.component.html - 8 - - - src/app/dashboard/dashboard.component.html - 154,161 - - Broadcast Transaction - shared.broadcast-transaction - Transaction hex @@ -3909,7 +4091,7 @@ src/app/components/transaction/transaction.component.html - 296,297 + 291,292 transaction.hex @@ -4024,6 +4206,70 @@ search-form.search-title + + Bitcoin Block Height + + src/app/components/search-form/search-results/search-results.component.html + 3 + + search.bitcoin-block-height + + + Bitcoin Transaction + + src/app/components/search-form/search-results/search-results.component.html + 9 + + search.bitcoin-transaction + + + Bitcoin Address + + src/app/components/search-form/search-results/search-results.component.html + 15 + + search.bitcoin-address + + + Bitcoin Block + + src/app/components/search-form/search-results/search-results.component.html + 21 + + search.bitcoin-block + + + Bitcoin Addresses + + src/app/components/search-form/search-results/search-results.component.html + 27 + + search.bitcoin-addresses + + + Lightning Nodes + + src/app/components/search-form/search-results/search-results.component.html + 35 + + search.lightning-nodes + + + Lightning Channels + + src/app/components/search-form/search-results/search-results.component.html + 43 + + search.lightning-channels + + + Go to "" + + src/app/components/search-form/search-results/search-results.component.html + 52 + + search.go-to + Mempool by vBytes (sat/vByte) @@ -4049,7 +4295,7 @@ Filter src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4058,7 +4304,7 @@ Invertir src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4066,7 +4312,7 @@ Transaction vBytes per second (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4074,193 +4320,185 @@ Just now Ara mateix - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4299,7 +4537,7 @@ src/app/components/transactions-list/transactions-list.component.html - 298,301 + 300,303 Transaction unconfirmed state transaction.unconfirmed @@ -4309,11 +4547,11 @@ Vist per primera vegada src/app/components/transaction/transaction.component.html - 108,109 + 102,103 src/app/lightning/node/node.component.html - 67,70 + 70,73 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -4329,11 +4567,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 13,15 + 15,16 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 13,15 + 15,16 Transaction first seen transaction.first-seen @@ -4343,7 +4581,7 @@ ETA src/app/components/transaction/transaction.component.html - 115,116 + 109,110 Transaction ETA transaction.eta @@ -4353,7 +4591,7 @@ D'aquí unes hores (o més) src/app/components/transaction/transaction.component.html - 121,124 + 115,118 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -4362,11 +4600,11 @@ Descendant src/app/components/transaction/transaction.component.html - 168,170 + 162,164 src/app/components/transaction/transaction.component.html - 179,181 + 173,175 Descendant transaction.descendant @@ -4375,7 +4613,7 @@ Ancestor src/app/components/transaction/transaction.component.html - 190,192 + 184,186 Transaction Ancestor transaction.ancestor @@ -4384,11 +4622,11 @@ Flow src/app/components/transaction/transaction.component.html - 208,211 + 202,205 src/app/components/transaction/transaction.component.html - 346,350 + 341,345 Transaction flow transaction.flow @@ -4397,7 +4635,7 @@ Hide diagram src/app/components/transaction/transaction.component.html - 211,216 + 205,210 hide-diagram @@ -4405,7 +4643,7 @@ Show more src/app/components/transaction/transaction.component.html - 231,233 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4421,7 +4659,7 @@ Show less src/app/components/transaction/transaction.component.html - 233,239 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4433,7 +4671,7 @@ Show diagram src/app/components/transaction/transaction.component.html - 253,254 + 248,249 show-diagram @@ -4441,7 +4679,7 @@ Locktime src/app/components/transaction/transaction.component.html - 292,294 + 287,289 transaction.locktime @@ -4449,7 +4687,7 @@ Transaction not found. src/app/components/transaction/transaction.component.html - 455,456 + 450,451 transaction.error.transaction-not-found @@ -4458,7 +4696,7 @@ Esperant a que apareixi a la memòria... src/app/components/transaction/transaction.component.html - 456,461 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4467,7 +4705,7 @@ Quota efectiva d'intercanvi src/app/components/transaction/transaction.component.html - 489,492 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -4607,7 +4845,7 @@ Show more inputs to reveal fee data src/app/components/transactions-list/transactions-list.component.html - 288,291 + 290,293 transactions-list.load-to-reveal-fee-info @@ -4615,7 +4853,7 @@ remaining src/app/components/transactions-list/transactions-list.component.html - 330,331 + 332,333 x-remaining @@ -4849,21 +5087,12 @@ dashboard.latest-transactions - - USD - USD - - src/app/dashboard/dashboard.component.html - 126,127 - - dashboard.latest-transactions.USD - Minimum fee Quota mínima src/app/dashboard/dashboard.component.html - 201,202 + 210,211 Minimum mempool fee dashboard.minimum-fee @@ -4872,7 +5101,7 @@ Purging src/app/dashboard/dashboard.component.html - 202,203 + 211,212 Purgin below fee dashboard.purging @@ -4882,7 +5111,7 @@ Ús de memòria src/app/dashboard/dashboard.component.html - 214,215 + 223,224 Memory usage dashboard.memory-usage @@ -4891,15 +5120,27 @@ L-BTC in circulation src/app/dashboard/dashboard.component.html - 228,230 + 237,239 dashboard.lbtc-pegs-in-circulation + + mempool.space merely provides data about the Bitcoin network. It cannot help you with retrieving funds, confirming your transaction quicker, etc. + + src/app/docs/api-docs/api-docs.component.html + 13 + + + src/app/docs/api-docs/api-docs.component.html + 14 + + faq.big-disclaimer + REST API service src/app/docs/api-docs/api-docs.component.html - 39,40 + 42,43 api-docs.title @@ -4907,11 +5148,11 @@ Endpoint src/app/docs/api-docs/api-docs.component.html - 48,49 + 51,52 src/app/docs/api-docs/api-docs.component.html - 102,105 + 105,108 Api docs endpoint @@ -4920,18 +5161,18 @@ Descripció src/app/docs/api-docs/api-docs.component.html - 67,68 + 70,71 src/app/docs/api-docs/api-docs.component.html - 106,107 + 109,110 Default push: action: 'want', data: ['blocks', ...] to express what you want pushed. Available: blocks, mempool-blocks, live-2h-chart, and stats.Push transactions related to address: 'track-address': '3PbJ...bF9B' to receive all new transactions containing that address as input or output. Returns an array of transactions. address-transactions for new mempool transactions, and block-transactions for new block confirmed transactions. src/app/docs/api-docs/api-docs.component.html - 107,108 + 110,111 api-docs.websocket.websocket @@ -5025,7 +5266,7 @@ src/app/lightning/node/node.component.html - 180,182 + 183,185 shared.m-sats @@ -5093,7 +5334,11 @@ src/app/lightning/channels-list/channels-list.component.html - 120,121 + 123,124 + + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 lightning.x-channels @@ -5131,11 +5376,11 @@ src/app/lightning/channel/channel.component.html - 11,12 + 13,14 src/app/lightning/channels-list/channels-list.component.html - 65,66 + 68,69 status.inactive @@ -5147,11 +5392,11 @@ src/app/lightning/channel/channel.component.html - 12,13 + 14,15 src/app/lightning/channels-list/channels-list.component.html - 66,68 + 69,71 status.active @@ -5163,7 +5408,7 @@ src/app/lightning/channel/channel.component.html - 13,14 + 15,16 src/app/lightning/channels-list/channels-list.component.html @@ -5171,7 +5416,7 @@ src/app/lightning/channels-list/channels-list.component.html - 68,70 + 71,73 status.closed @@ -5183,7 +5428,7 @@ src/app/lightning/channel/channel.component.html - 29,30 + 36,37 lightning.created @@ -5195,11 +5440,19 @@ src/app/lightning/channel/channel.component.html - 48,49 + 55,56 src/app/lightning/channels-list/channels-list.component.html - 40,43 + 43,46 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 src/app/lightning/node-statistics/node-statistics.component.html @@ -5207,7 +5460,7 @@ src/app/lightning/node-statistics/node-statistics.component.html - 47,50 + 46,49 src/app/lightning/nodes-list/nodes-list.component.html @@ -5229,6 +5482,10 @@ src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 60,62 + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 13,14 + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 202,201 @@ -5263,11 +5520,11 @@ Lightning channel src/app/lightning/channel/channel.component.html - 2,5 + 4,7 src/app/lightning/channel/channel.component.html - 117,119 + 116,118 lightning.channel @@ -5275,11 +5532,11 @@ Last update src/app/lightning/channel/channel.component.html - 33,34 + 40,41 src/app/lightning/node/node.component.html - 73,75 + 76,78 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5295,11 +5552,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 14,15 + 16,17 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 14,15 + 16,17 lightning.last-update @@ -5307,11 +5564,11 @@ Closing date src/app/lightning/channel/channel.component.html - 37,38 + 44,45 src/app/lightning/channels-list/channels-list.component.html - 39,40 + 42,44 lightning.closing_date @@ -5319,7 +5576,7 @@ Closed by src/app/lightning/channel/channel.component.html - 52,54 + 59,61 lightning.closed_by @@ -5327,7 +5584,7 @@ Opening transaction src/app/lightning/channel/channel.component.html - 84,85 + 91,92 lightning.opening-transaction @@ -5335,7 +5592,7 @@ Closing transaction src/app/lightning/channel/channel.component.html - 93,95 + 100,102 lightning.closing-transaction @@ -5346,6 +5603,27 @@ 37 + + Mutually closed + + src/app/lightning/channel/closing-type/closing-type.component.ts + 20 + + + + Force closed + + src/app/lightning/channel/closing-type/closing-type.component.ts + 24 + + + + Force closed with penalty + + src/app/lightning/channel/closing-type/closing-type.component.ts + 28 + + Open @@ -5358,7 +5636,7 @@ No channels to display src/app/lightning/channels-list/channels-list.component.html - 29,35 + 29,37 lightning.empty-channels-list @@ -5366,7 +5644,7 @@ Alias src/app/lightning/channels-list/channels-list.component.html - 35,37 + 38,40 src/app/lightning/group/group.component.html @@ -5390,11 +5668,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 10,11 + 11,12 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 10,12 + 11,13 lightning.alias @@ -5402,7 +5680,7 @@ Status src/app/lightning/channels-list/channels-list.component.html - 37,38 + 40,41 status @@ -5410,7 +5688,7 @@ Channel ID src/app/lightning/channels-list/channels-list.component.html - 41,45 + 44,48 channels.id @@ -5418,11 +5696,11 @@ sats src/app/lightning/channels-list/channels-list.component.html - 60,64 + 63,68 src/app/lightning/channels-list/channels-list.component.html - 84,88 + 87,91 src/app/lightning/channels-statistics/channels-statistics.component.html @@ -5466,6 +5744,22 @@ shared.sats + + avg + + src/app/lightning/channels-statistics/channels-statistics.component.html + 3,5 + + statistics.average-small + + + med + + src/app/lightning/channels-statistics/channels-statistics.component.html + 6,9 + + statistics.median-small + Avg Capacity @@ -5582,11 +5876,11 @@ src/app/lightning/node-statistics/node-statistics.component.html - 17,18 + 16,17 src/app/lightning/node-statistics/node-statistics.component.html - 54,57 + 53,56 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -5634,10 +5928,6 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 11,12 - - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html 12,13 lightning.liquidity @@ -5653,12 +5943,20 @@ 40,44 - src/app/lightning/node-statistics/node-statistics.component.html - 29,30 + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 src/app/lightning/node-statistics/node-statistics.component.html - 61,64 + 28,29 + + + src/app/lightning/node-statistics/node-statistics.component.html + 60,63 src/app/lightning/nodes-list/nodes-list.component.html @@ -5690,16 +5988,20 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 12,13 + 14,15 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 11,12 + 12,13 src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -5730,7 +6032,7 @@ src/app/lightning/node/node.component.html - 47,49 + 50,52 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5746,11 +6048,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 15,17 + 17,20 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 15,17 + 17,20 lightning.location @@ -5784,9 +6086,17 @@ src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 62 + + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html + 4,9 + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.ts - 29 + 33 + + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 4,9 src/app/lightning/nodes-rankings-dashboard/nodes-rankings-dashboard.component.html @@ -5814,6 +6124,28 @@ lightning.node-fee-distribution + + Outgoing Fees + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 170 + + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 208 + + + + Incoming Fees + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 178 + + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 222 + + Percentage change past week @@ -5822,11 +6154,11 @@ src/app/lightning/node-statistics/node-statistics.component.html - 18,20 + 17,19 src/app/lightning/node-statistics/node-statistics.component.html - 30,32 + 29,31 mining.percentage-change-last-week @@ -5838,11 +6170,11 @@ src/app/lightning/node/node.component.html - 2,4 + 4,6 src/app/lightning/node/node.component.html - 260,262 + 263,265 lightning.node @@ -5854,7 +6186,7 @@ src/app/lightning/node/node.component.html - 27,30 + 30,33 lightning.active-capacity @@ -5866,7 +6198,7 @@ src/app/lightning/node/node.component.html - 34,38 + 37,41 lightning.active-channels @@ -5878,19 +6210,11 @@ country - - No node found for public key "" - - src/app/lightning/node/node.component.html - 17,19 - - lightning.node-not-found - Average channel size src/app/lightning/node/node.component.html - 40,43 + 43,46 lightning.active-channels-avg @@ -5898,7 +6222,7 @@ Avg channel distance src/app/lightning/node/node.component.html - 56,57 + 59,60 lightning.avg-distance @@ -5906,7 +6230,7 @@ Color src/app/lightning/node/node.component.html - 79,81 + 82,84 lightning.color @@ -5914,7 +6238,7 @@ ISP src/app/lightning/node/node.component.html - 86,87 + 89,90 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html @@ -5926,7 +6250,7 @@ Exclusively on Tor src/app/lightning/node/node.component.html - 93,95 + 96,98 tor @@ -5934,7 +6258,7 @@ Liquidity ad src/app/lightning/node/node.component.html - 138,141 + 141,144 node.liquidity-ad @@ -5942,7 +6266,7 @@ Lease fee rate src/app/lightning/node/node.component.html - 144,147 + 147,150 Liquidity ad lease fee rate liquidity-ad.lease-fee-rate @@ -5951,7 +6275,7 @@ Lease base fee src/app/lightning/node/node.component.html - 152,154 + 155,157 liquidity-ad.lease-base-fee @@ -5959,7 +6283,7 @@ Funding weight src/app/lightning/node/node.component.html - 158,159 + 161,162 liquidity-ad.funding-weight @@ -5967,7 +6291,7 @@ Channel fee rate src/app/lightning/node/node.component.html - 168,171 + 171,174 Liquidity ad channel fee rate liquidity-ad.channel-fee-rate @@ -5976,7 +6300,7 @@ Channel base fee src/app/lightning/node/node.component.html - 176,178 + 179,181 liquidity-ad.channel-base-fee @@ -5984,7 +6308,7 @@ Compact lease src/app/lightning/node/node.component.html - 188,190 + 191,193 liquidity-ad.compact-lease @@ -5992,7 +6316,7 @@ TLV extension records src/app/lightning/node/node.component.html - 199,202 + 202,205 node.tlv.records @@ -6000,7 +6324,7 @@ Open channels src/app/lightning/node/node.component.html - 240,243 + 243,246 lightning.open-channels @@ -6008,7 +6332,7 @@ Closed channels src/app/lightning/node/node.component.html - 244,247 + 247,250 lightning.open-channels @@ -6050,7 +6374,7 @@ No geolocation data available src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts - 218,213 + 219,214 @@ -6072,8 +6396,8 @@ 112,107 - - Reachable on Clearnet Only + + Clearnet and Darknet src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -6083,8 +6407,8 @@ 303,302 - - Reachable on Clearnet and Darknet + + Clearnet Only (IPv4, IPv6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -6094,8 +6418,8 @@ 295,294 - - Reachable on Darknet Only + + Darknet Only (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -6118,25 +6442,29 @@ lightning.share - nodes + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 BTC capacity src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6242,11 +6570,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 @@ -6327,22 +6655,6 @@ 27 - - Top 100 nodes liquidity ranking - - src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 3,7 - - lightning.top-100-liquidity - - - Top 100 nodes connectivity ranking - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 3,7 - - lightning.top-100-connectivity - Oldest nodes diff --git a/frontend/src/locale/messages.es.xlf b/frontend/src/locale/messages.es.xlf index e0cc2d847..8baaf9532 100644 --- a/frontend/src/locale/messages.es.xlf +++ b/frontend/src/locale/messages.es.xlf @@ -3203,6 +3203,7 @@ blocks expected + bloques esperados src/app/components/difficulty/difficulty-tooltip.component.html 13 @@ -3211,6 +3212,7 @@ block expected + bloque esperado src/app/components/difficulty/difficulty-tooltip.component.html 14 @@ -3237,6 +3239,7 @@ blocks remaining + bloques restantes src/app/components/difficulty/difficulty-tooltip.component.html 24 @@ -3245,6 +3248,7 @@ block remaining + bloque restante src/app/components/difficulty/difficulty-tooltip.component.html 25 @@ -3253,6 +3257,7 @@ blocks ahead + bloques por delante src/app/components/difficulty/difficulty-tooltip.component.html 29 @@ -3261,6 +3266,7 @@ block ahead + bloque por delante src/app/components/difficulty/difficulty-tooltip.component.html 30 @@ -3269,6 +3275,7 @@ blocks behind + bloques por detrás src/app/components/difficulty/difficulty-tooltip.component.html 34 @@ -3277,6 +3284,7 @@ block behind + bloque por detrás src/app/components/difficulty/difficulty-tooltip.component.html 35 @@ -3285,6 +3293,7 @@ Average block time + Tiempo medio de bloque src/app/components/difficulty/difficulty.component.html 42,45 @@ -3929,7 +3938,7 @@ Avg Health - El promedio de salud + Promedio de salud src/app/components/pool-ranking/pool-ranking.component.html 96,97 @@ -3986,6 +3995,7 @@ blocks + bloques src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -5352,7 +5362,7 @@ mempool.space merely provides data about the Bitcoin network. It cannot help you with retrieving funds, confirming your transaction quicker, etc. - memepool.space simplemente proporciona datos sobre la red Bitcoin. No puede ayudarle a recuperar fondos, confirmar su transacción más rápdio, etc. + mempool.space simplemente proporciona datos sobre la red Bitcoin. No puede ayudarle a recuperar fondos, confirmar su transacción más rápido, etc. src/app/docs/api-docs/api-docs.component.html 13 @@ -5870,7 +5880,7 @@ Force closed - Forzar cierre + Cierre forzado src/app/lightning/channel/closing-type/closing-type.component.ts 24 @@ -5878,7 +5888,7 @@ Force closed with penalty - Fuerza cerrada con sanción + Cierre forzado con sanción src/app/lightning/channel/closing-type/closing-type.component.ts 28 @@ -6012,7 +6022,7 @@ avg - El promedio + Promedio src/app/lightning/channels-statistics/channels-statistics.component.html 3,5 @@ -6021,7 +6031,7 @@ med - Media + Med src/app/lightning/channels-statistics/channels-statistics.component.html 6,9 @@ -6416,7 +6426,7 @@ Outgoing Fees - Gastos de salida + Tasas de salida src/app/lightning/node-fee-chart/node-fee-chart.component.ts 170 @@ -6428,7 +6438,7 @@ Incoming Fees - Gastos de entrada + Tasas de entrada src/app/lightning/node-fee-chart/node-fee-chart.component.ts 178 diff --git a/frontend/src/locale/messages.fr.xlf b/frontend/src/locale/messages.fr.xlf index d4158fdaa..9bf9db7c0 100644 --- a/frontend/src/locale/messages.fr.xlf +++ b/frontend/src/locale/messages.fr.xlf @@ -7038,7 +7038,7 @@ year - année + année src/app/shared/i18n/dates.ts 3 @@ -7046,7 +7046,7 @@ years - ans + ans src/app/shared/i18n/dates.ts 4 @@ -7054,7 +7054,7 @@ month - mois + mois src/app/shared/i18n/dates.ts 5 @@ -7062,7 +7062,7 @@ months - mois + mois src/app/shared/i18n/dates.ts 6 @@ -7070,7 +7070,7 @@ week - sem + sem src/app/shared/i18n/dates.ts 7 @@ -7078,7 +7078,7 @@ weeks - sem + sem src/app/shared/i18n/dates.ts 8 @@ -7086,7 +7086,7 @@ day - jour + jour src/app/shared/i18n/dates.ts 9 @@ -7094,7 +7094,7 @@ days - jours + jours src/app/shared/i18n/dates.ts 10 @@ -7102,7 +7102,7 @@ hour - heure + heure src/app/shared/i18n/dates.ts 11 @@ -7110,7 +7110,7 @@ hours - heures + heures src/app/shared/i18n/dates.ts 12 @@ -7118,7 +7118,7 @@ minute - minute + minute src/app/shared/i18n/dates.ts 13 @@ -7126,7 +7126,7 @@ minutes - minutes + minutes src/app/shared/i18n/dates.ts 14 @@ -7134,7 +7134,7 @@ second - seconde + seconde src/app/shared/i18n/dates.ts 15 @@ -7142,7 +7142,7 @@ seconds - secondes + secondes src/app/shared/i18n/dates.ts 16 diff --git a/frontend/src/locale/messages.hi.xlf b/frontend/src/locale/messages.hi.xlf index 5eda29125..0bd98f80f 100644 --- a/frontend/src/locale/messages.hi.xlf +++ b/frontend/src/locale/messages.hi.xlf @@ -355,11 +355,11 @@ src/app/components/block/block.component.html - 290,291 + 310,311 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 26,27 + 46,47 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -380,11 +380,11 @@ src/app/components/block/block.component.html - 291,292 + 311,312 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 27,28 + 47,48 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -422,7 +422,7 @@ src/app/components/block/block.component.html - 40,41 + 38,39 block.hash @@ -447,7 +447,7 @@ src/app/components/block/block.component.html - 44,46 + 42,44 src/app/components/blocks-list/blocks-list.component.html @@ -590,11 +590,11 @@ src/app/components/master-page/master-page.component.html - 49,51 + 48,50 src/app/components/pool-ranking/pool-ranking.component.html - 94,96 + 94,95 @@ -745,11 +745,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -770,16 +770,24 @@ src/app/components/about/about.component.html - 385,389 + 391,394 + + + src/app/components/mining-dashboard/mining-dashboard.component.html + 87 src/app/dashboard/dashboard.component.html - 150,152 + 157,159 src/app/docs/docs/docs.component.html 51 + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 97 + Terms of Service shared.terms-of-service @@ -790,14 +798,22 @@ src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html 113,120 + + src/app/components/mining-dashboard/mining-dashboard.component.html + 89 + src/app/dashboard/dashboard.component.html - 152,154 + 159,161 src/app/docs/docs/docs.component.html 53 + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 99 + Privacy Policy shared.privacy-policy @@ -985,7 +1001,7 @@ src/app/dashboard/dashboard.component.html - 124,125 + 124,126 @@ -1033,7 +1049,7 @@ src/app/components/transaction/transaction.component.html - 158,160 + 152,154 src/app/components/transactions-list/transactions-list.component.html @@ -1049,11 +1065,11 @@ src/app/components/block/block.component.html - 246,247 + 252,253 src/app/components/transaction/transaction.component.html - 288,290 + 283,285 transaction.version @@ -1103,7 +1119,7 @@ src/app/components/transactions-list/transactions-list.component.html - 294,295 + 296,297 Transaction singular confirmation count shared.confirmation-count.singular @@ -1125,7 +1141,7 @@ src/app/components/transactions-list/transactions-list.component.html - 295,296 + 297,298 Transaction plural confirmation count shared.confirmation-count.plural @@ -1137,10 +1153,6 @@ src/app/bisq/bisq-transaction/bisq-transaction.component.html 43,45 - - src/app/components/transaction/transaction.component.html - 65,67 - Transaction included in block transaction.included-in-block @@ -1153,11 +1165,11 @@ src/app/components/transaction/transaction.component.html - 77,80 + 71,74 src/app/components/transaction/transaction.component.html - 135,138 + 129,132 Transaction features transaction.features @@ -1185,11 +1197,11 @@ src/app/components/transaction/transaction.component.html - 262,267 + 257,262 src/app/components/transaction/transaction.component.html - 406,412 + 401,407 transaction.details @@ -1206,11 +1218,11 @@ src/app/components/transaction/transaction.component.html - 249,253 + 244,248 src/app/components/transaction/transaction.component.html - 377,383 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1228,7 +1240,7 @@ src/app/components/transaction/transaction.component.ts - 241,240 + 246,245 @@ -1248,7 +1260,7 @@ src/app/components/transaction/transaction.component.html - 159,160 + 153,154 src/app/dashboard/dashboard.component.html @@ -1264,7 +1276,7 @@ src/app/components/transaction/transaction.component.html - 72,73 + 66,67 Transaction Confirmed state transaction.confirmed @@ -1434,7 +1446,7 @@ Our mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, completely self-hosted without any trusted third-parties. src/app/components/about/about.component.html - 13,17 + 13,16 @@ -1442,7 +1454,7 @@ एंटरप्राइज़ प्रायोजक src/app/components/about/about.component.html - 29,32 + 19,22 about.sponsors.enterprise.withRocket @@ -1451,7 +1463,7 @@ समुदाय प्रायोजक ❤️ src/app/components/about/about.component.html - 177,180 + 167,170 about.sponsors.withHeart @@ -1459,7 +1471,7 @@ Community Integrations src/app/components/about/about.component.html - 191,193 + 181,183 about.community-integrations @@ -1468,7 +1480,7 @@ सामुदायिक गठबंधन src/app/components/about/about.component.html - 285,287 + 291,293 about.alliances @@ -1476,7 +1488,7 @@ Project Translators src/app/components/about/about.component.html - 301,303 + 307,309 about.translators @@ -1485,7 +1497,7 @@ परियोजना योगदानकर्ता src/app/components/about/about.component.html - 315,317 + 321,323 about.contributors @@ -1494,7 +1506,7 @@ परियोजना सदस्य src/app/components/about/about.component.html - 327,329 + 333,335 about.project_members @@ -1503,7 +1515,7 @@ परियोजना अनुरक्षक src/app/components/about/about.component.html - 340,342 + 346,348 about.maintainers @@ -1512,7 +1524,7 @@ विवरण src/app/components/about/about.component.ts - 39 + 42 src/app/components/bisq-master-page/bisq-master-page.component.html @@ -1524,7 +1536,7 @@ src/app/components/master-page/master-page.component.html - 58,61 + 57,60 @@ -1560,7 +1572,7 @@ src/app/components/amount/amount.component.html - 6,9 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -1576,7 +1588,7 @@ src/app/components/transactions-list/transactions-list.component.html - 302,304 + 304,306 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -1656,7 +1668,7 @@ src/app/components/assets/assets.component.html - 29,31 + 31,33 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -1875,7 +1887,7 @@ src/app/components/assets/assets.component.html - 30,31 + 32,33 Asset ticker header @@ -1888,7 +1900,7 @@ src/app/components/assets/assets.component.html - 31,34 + 33,36 Asset Issuer Domain header @@ -1901,7 +1913,7 @@ src/app/components/assets/assets.component.html - 32,36 + 34,38 Asset ID header @@ -1910,7 +1922,7 @@ एसेट डेटा लोड करने में गड़बड़ी. src/app/components/assets/assets.component.html - 48,53 + 50,55 Asset data load error @@ -2016,7 +2028,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -2032,7 +2044,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 161 + 165 @@ -2047,7 +2059,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 163 + 167 @@ -2058,11 +2070,11 @@ src/app/components/block-fees-graph/block-fees-graph.component.ts - 62 + 67 src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -2070,19 +2082,19 @@ Indexing blocks src/app/components/block-fees-graph/block-fees-graph.component.ts - 110,105 + 116,111 src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 108,103 + 113,108 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 115,110 + 116,111 src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -2122,7 +2134,7 @@ src/app/components/transaction/transaction.component.html - 476 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2148,11 +2160,11 @@ src/app/components/transaction/transaction.component.html - 476,477 + 473 src/app/components/transactions-list/transactions-list.component.html - 286,287 + 288 sat shared.sat @@ -2166,11 +2178,11 @@ src/app/components/transaction/transaction.component.html - 161,165 + 155,159 src/app/components/transaction/transaction.component.html - 479,481 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2182,7 +2194,7 @@ src/app/lightning/channels-list/channels-list.component.html - 38,39 + 41,43 Transaction fee rate transaction.fee-rate @@ -2200,19 +2212,19 @@ src/app/components/block/block.component.html - 125,128 + 124,127 src/app/components/block/block.component.html - 129 + 128,130 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 12,14 + 19,22 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 15,17 + 30,33 src/app/components/fees-box/fees-box.component.html @@ -2252,27 +2264,27 @@ src/app/components/transaction/transaction.component.html - 173,174 + 167,168 src/app/components/transaction/transaction.component.html - 184,185 + 178,179 src/app/components/transaction/transaction.component.html - 195,196 + 189,190 src/app/components/transaction/transaction.component.html - 481,484 + 478,481 src/app/components/transaction/transaction.component.html - 492,494 + 489,491 src/app/components/transactions-list/transactions-list.component.html - 286 + 286,287 src/app/dashboard/dashboard.component.html @@ -2280,7 +2292,7 @@ src/app/dashboard/dashboard.component.html - 204,208 + 213,217 sat/vB shared.sat-vbyte @@ -2294,11 +2306,11 @@ src/app/components/transaction/transaction.component.html - 160,162 + 154,156 src/app/components/transaction/transaction.component.html - 274,277 + 269,272 Transaction Virtual Size transaction.vsize @@ -2367,7 +2379,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2401,11 +2413,11 @@ src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 60 + 65 src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2421,7 +2433,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2430,15 +2442,15 @@ साइज src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 180,179 + 184,183 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 226,224 + 239,237 src/app/components/block/block.component.html - 50,52 + 48,50 src/app/components/blocks-list/blocks-list.component.html @@ -2462,7 +2474,7 @@ src/app/components/transaction/transaction.component.html - 270,272 + 265,267 src/app/dashboard/dashboard.component.html @@ -2474,11 +2486,11 @@ वेइट src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 188,187 + 192,191 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 257,254 + 270,267 src/app/components/block/block-preview.component.html @@ -2486,11 +2498,22 @@ src/app/components/block/block.component.html - 54,56 + 52,54 src/app/components/transaction/transaction.component.html - 278,280 + 273,275 + + + + Size per weight + + src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts + 200,199 + + + src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts + 282,279 @@ -2505,14 +2528,6 @@ shared.block-title - - - - src/app/components/block/block-preview.component.html - 11,12 - - shared.block-title - Median fee औसत शुल्क @@ -2522,7 +2537,7 @@ src/app/components/block/block.component.html - 128,129 + 127,128 src/app/components/mempool-block/mempool-block.component.html @@ -2539,11 +2554,11 @@ src/app/components/block/block.component.html - 133,135 + 138,140 src/app/components/block/block.component.html - 159,162 + 164,167 src/app/components/mempool-block/mempool-block.component.html @@ -2561,7 +2576,7 @@ src/app/components/block/block.component.html - 168,170 + 173,175 block.miner @@ -2574,7 +2589,7 @@ src/app/components/block/block.component.ts - 227 + 242 @@ -2584,6 +2599,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2599,31 +2618,47 @@ Previous Block - - Block health + + Health src/app/components/block/block.component.html - 58,61 + 56 - block.health + + src/app/components/blocks-list/blocks-list.component.html + 18,19 + + + src/app/components/blocks-list/blocks-list.component.html + 18,19 + + latest-blocks.health Unknown src/app/components/block/block.component.html - 69,72 + 67,70 src/app/components/blocks-list/blocks-list.component.html 60,63 - src/app/lightning/node/node.component.html - 52,55 + src/app/components/pool-ranking/pool-ranking.component.html + 121,124 + + + src/app/lightning/channel/closing-type/closing-type.component.ts + 32 src/app/lightning/node/node.component.html - 96,100 + 55,58 + + + src/app/lightning/node/node.component.html + 99,103 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts @@ -2640,7 +2675,7 @@ फी स्पेन src/app/components/block/block.component.html - 124,125 + 123,124 src/app/components/mempool-block/mempool-block.component.html @@ -2653,7 +2688,7 @@ 140 वीबाइट्स के औसत नेटिव सेगविट लेनदेन के आधार पर src/app/components/block/block.component.html - 129,131 + 131,136 src/app/components/fees-box/fees-box.component.html @@ -2677,49 +2712,60 @@ Transaction fee tooltip - - Subsidy + fees: - सब्सिडी + शुल्क: + + Subsidy + fees src/app/components/block/block.component.html - 148,151 + 153,156 src/app/components/block/block.component.html - 163,167 + 168,172 Total subsidy and fees in a block block.subsidy-and-fees - - Projected + + Expected src/app/components/block/block.component.html - 210,212 + 216 - block.projected + block.expected + + + beta + + src/app/components/block/block.component.html + 216,217 + + + src/app/components/block/block.component.html + 222,224 + + beta Actual src/app/components/block/block.component.html - 212,216 + 218,222 block.actual - - Projected Block + + Expected Block src/app/components/block/block.component.html - 216,218 + 222 - block.projected-block + block.expected-block Actual Block src/app/components/block/block.component.html - 225,227 + 231 block.actual-block @@ -2728,7 +2774,7 @@ बिट्स src/app/components/block/block.component.html - 250,252 + 256,258 block.bits @@ -2737,7 +2783,7 @@ मर्कल रुट src/app/components/block/block.component.html - 254,256 + 260,262 block.merkle-root @@ -2746,7 +2792,7 @@ कठिनाई src/app/components/block/block.component.html - 265,268 + 271,274 src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html @@ -2762,11 +2808,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2775,7 +2821,7 @@ नोन्स src/app/components/block/block.component.html - 269,271 + 275,277 block.nonce @@ -2784,32 +2830,41 @@ ब्लॉक हैडर हेक्स src/app/components/block/block.component.html - 273,274 + 279,280 block.header + + Audit + + src/app/components/block/block.component.html + 297,301 + + Toggle Audit + block.toggle-audit + Details विवरण src/app/components/block/block.component.html - 284,288 + 304,308 src/app/components/transaction/transaction.component.html - 254,259 + 249,254 src/app/lightning/channel/channel.component.html - 86,88 + 93,95 src/app/lightning/channel/channel.component.html - 96,98 + 103,105 src/app/lightning/node/node.component.html - 218,222 + 221,225 Transaction Details transaction.details @@ -2818,20 +2873,16 @@ Error loading data. src/app/components/block/block.component.html - 303,305 + 323,325 src/app/components/block/block.component.html - 339,343 + 362,366 src/app/lightning/channel/channel-preview.component.html 70,75 - - src/app/lightning/channel/channel.component.html - 109,115 - src/app/lightning/node/node-preview.component.html 66,69 @@ -2846,7 +2897,7 @@ Why is this block empty? src/app/components/block/block.component.html - 361,367 + 384,390 block.empty-block-explanation @@ -2891,18 +2942,6 @@ latest-blocks.mined - - Health - - src/app/components/blocks-list/blocks-list.component.html - 18,19 - - - src/app/components/blocks-list/blocks-list.component.html - 18,19 - - latest-blocks.health - Reward @@ -2964,7 +3003,7 @@ src/app/dashboard/dashboard.component.html - 210,214 + 219,223 dashboard.txs @@ -2995,13 +3034,17 @@ Difficulty Adjustment डिफीकल्टी एडजस्टमेंट + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment @@ -3009,11 +3052,11 @@ Remaining बचा हुआ - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -3021,11 +3064,11 @@ blocks - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -3045,11 +3088,11 @@ block - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -3062,11 +3105,11 @@ Estimate आकलन - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -3075,20 +3118,24 @@ Previous पिछला - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period वर्तमान अवधि - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -3096,11 +3143,99 @@ Next Halving - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) @@ -3190,7 +3325,7 @@ src/app/dashboard/dashboard.component.html - 237,238 + 246,247 dashboard.incoming-transactions @@ -3203,7 +3338,7 @@ src/app/dashboard/dashboard.component.html - 240,243 + 249,252 dashboard.backend-is-synchronizing @@ -3216,7 +3351,7 @@ src/app/dashboard/dashboard.component.html - 245,250 + 254,259 vB/s shared.vbytes-per-second @@ -3230,7 +3365,7 @@ src/app/dashboard/dashboard.component.html - 208,209 + 217,218 Unconfirmed count dashboard.unconfirmed @@ -3249,7 +3384,7 @@ Mining src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3257,7 +3392,7 @@ Pools Ranking src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3269,7 +3404,7 @@ Pools Dominance src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3281,7 +3416,7 @@ Hashrate & Difficulty src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3289,7 +3424,7 @@ Lightning src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3297,7 +3432,7 @@ Lightning Nodes Per Network src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3317,7 +3452,7 @@ Lightning Network Capacity src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3337,7 +3472,7 @@ Lightning Nodes Per ISP src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3349,7 +3484,7 @@ Lightning Nodes Per Country src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3365,7 +3500,7 @@ Lightning Nodes World Map src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3381,7 +3516,7 @@ Lightning Nodes Channels World Map src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3401,11 +3536,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3433,11 +3568,11 @@ Hashrate (MA) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3470,7 +3605,7 @@ src/app/components/master-page/master-page.component.html - 52,54 + 51,53 src/app/components/statistics/statistics.component.ts @@ -3494,7 +3629,7 @@ Lightning Explorer src/app/components/master-page/master-page.component.html - 44,45 + 44,47 src/app/lightning/lightning-dashboard/lightning-dashboard.component.ts @@ -3502,20 +3637,12 @@ master-page.lightning - - beta - - src/app/components/master-page/master-page.component.html - 45,48 - - beta - Documentation प्रलेखन src/app/components/master-page/master-page.component.html - 55,57 + 54,56 src/app/docs/docs/docs.component.html @@ -3559,7 +3686,7 @@ Reward stats src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3567,7 +3694,7 @@ (144 blocks) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3576,7 +3703,7 @@ नई ब्लॉक src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3588,10 +3715,36 @@ Adjustments src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments + + Broadcast Transaction + प्रसारण लेनदेन + + src/app/components/mining-dashboard/mining-dashboard.component.html + 91 + + + src/app/components/push-transaction/push-transaction.component.html + 2 + + + src/app/components/push-transaction/push-transaction.component.html + 8 + + + src/app/dashboard/dashboard.component.html + 161,169 + + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 102 + + Broadcast Transaction + shared.broadcast-transaction + Pools luck (1 week) @@ -3652,7 +3805,7 @@ src/app/components/pool-ranking/pool-ranking.component.html - 136,138 + 152,154 master-page.blocks @@ -3680,11 +3833,23 @@ mining.rank + + Avg Health + + src/app/components/pool-ranking/pool-ranking.component.html + 96,97 + + + src/app/components/pool-ranking/pool-ranking.component.html + 96,98 + + latest-blocks.avg_health + Empty blocks src/app/components/pool-ranking/pool-ranking.component.html - 95,98 + 97,100 mining.empty-blocks @@ -3692,7 +3857,7 @@ All miners src/app/components/pool-ranking/pool-ranking.component.html - 113,114 + 129,130 mining.all-miners @@ -3700,7 +3865,7 @@ Pools Luck (1w) src/app/components/pool-ranking/pool-ranking.component.html - 130,132 + 146,148 mining.miners-luck @@ -3708,7 +3873,7 @@ Pools Count (1w) src/app/components/pool-ranking/pool-ranking.component.html - 142,144 + 158,160 mining.miners-count @@ -3716,11 +3881,11 @@ Mining Pools src/app/components/pool-ranking/pool-ranking.component.ts - 57 + 58 - - blocks + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3729,6 +3894,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -3930,24 +4130,6 @@ latest-blocks.coinbasetag - - Broadcast Transaction - प्रसारण लेनदेन - - src/app/components/push-transaction/push-transaction.component.html - 2 - - - src/app/components/push-transaction/push-transaction.component.html - 8 - - - src/app/dashboard/dashboard.component.html - 154,161 - - Broadcast Transaction - shared.broadcast-transaction - Transaction hex @@ -3956,7 +4138,7 @@ src/app/components/transaction/transaction.component.html - 296,297 + 291,292 transaction.hex @@ -4071,6 +4253,70 @@ search-form.search-title + + Bitcoin Block Height + + src/app/components/search-form/search-results/search-results.component.html + 3 + + search.bitcoin-block-height + + + Bitcoin Transaction + + src/app/components/search-form/search-results/search-results.component.html + 9 + + search.bitcoin-transaction + + + Bitcoin Address + + src/app/components/search-form/search-results/search-results.component.html + 15 + + search.bitcoin-address + + + Bitcoin Block + + src/app/components/search-form/search-results/search-results.component.html + 21 + + search.bitcoin-block + + + Bitcoin Addresses + + src/app/components/search-form/search-results/search-results.component.html + 27 + + search.bitcoin-addresses + + + Lightning Nodes + + src/app/components/search-form/search-results/search-results.component.html + 35 + + search.lightning-nodes + + + Lightning Channels + + src/app/components/search-form/search-results/search-results.component.html + 43 + + search.lightning-channels + + + Go to "" + + src/app/components/search-form/search-results/search-results.component.html + 52 + + search.go-to + Mempool by vBytes (sat/vByte) vBytes द्वारा मेमपूल (sat/vByte) @@ -4098,7 +4344,7 @@ फ़िल्टर src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -4107,7 +4353,7 @@ उल्टे src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -4116,7 +4362,7 @@ लेनदेन vBytes प्रति सेकंड (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second @@ -4124,196 +4370,187 @@ Just now अभी - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago पहले - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After . के बाद - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - ~ . में - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4353,7 +4590,7 @@ src/app/components/transactions-list/transactions-list.component.html - 298,301 + 300,303 Transaction unconfirmed state transaction.unconfirmed @@ -4363,11 +4600,11 @@ प्रथम देखा src/app/components/transaction/transaction.component.html - 108,109 + 102,103 src/app/lightning/node/node.component.html - 67,70 + 70,73 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -4383,11 +4620,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 13,15 + 15,16 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 13,15 + 15,16 Transaction first seen transaction.first-seen @@ -4397,7 +4634,7 @@ इटीए src/app/components/transaction/transaction.component.html - 115,116 + 109,110 Transaction ETA transaction.eta @@ -4407,7 +4644,7 @@ कई घंटों में (या अधिक) src/app/components/transaction/transaction.component.html - 121,124 + 115,118 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -4417,11 +4654,11 @@ वंशज src/app/components/transaction/transaction.component.html - 168,170 + 162,164 src/app/components/transaction/transaction.component.html - 179,181 + 173,175 Descendant transaction.descendant @@ -4431,7 +4668,7 @@ पूर्वज src/app/components/transaction/transaction.component.html - 190,192 + 184,186 Transaction Ancestor transaction.ancestor @@ -4440,11 +4677,11 @@ Flow src/app/components/transaction/transaction.component.html - 208,211 + 202,205 src/app/components/transaction/transaction.component.html - 346,350 + 341,345 Transaction flow transaction.flow @@ -4453,7 +4690,7 @@ Hide diagram src/app/components/transaction/transaction.component.html - 211,216 + 205,210 hide-diagram @@ -4461,7 +4698,7 @@ Show more src/app/components/transaction/transaction.component.html - 231,233 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4477,7 +4714,7 @@ Show less src/app/components/transaction/transaction.component.html - 233,239 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4489,7 +4726,7 @@ Show diagram src/app/components/transaction/transaction.component.html - 253,254 + 248,249 show-diagram @@ -4498,7 +4735,7 @@ लॉकटाइम src/app/components/transaction/transaction.component.html - 292,294 + 287,289 transaction.locktime @@ -4507,7 +4744,7 @@ ट्रांसेक्शन नहीं मिला। src/app/components/transaction/transaction.component.html - 455,456 + 450,451 transaction.error.transaction-not-found @@ -4516,7 +4753,7 @@ मेमपूल में इसके प्रकट होने की प्रतीक्षा की जा रही है... src/app/components/transaction/transaction.component.html - 456,461 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4525,7 +4762,7 @@ प्रभावी शुल्क दर src/app/components/transaction/transaction.component.html - 489,492 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -4672,7 +4909,7 @@ Show more inputs to reveal fee data src/app/components/transactions-list/transactions-list.component.html - 288,291 + 290,293 transactions-list.load-to-reveal-fee-info @@ -4680,7 +4917,7 @@ remaining src/app/components/transactions-list/transactions-list.component.html - 330,331 + 332,333 x-remaining @@ -4918,21 +5155,12 @@ dashboard.latest-transactions - - USD - USD - - src/app/dashboard/dashboard.component.html - 126,127 - - dashboard.latest-transactions.USD - Minimum fee न्यूनतम शुल्क src/app/dashboard/dashboard.component.html - 201,202 + 210,211 Minimum mempool fee dashboard.minimum-fee @@ -4942,7 +5170,7 @@ पर्जिंग src/app/dashboard/dashboard.component.html - 202,203 + 211,212 Purgin below fee dashboard.purging @@ -4952,7 +5180,7 @@ मेमोरी उपयोग src/app/dashboard/dashboard.component.html - 214,215 + 223,224 Memory usage dashboard.memory-usage @@ -4962,15 +5190,27 @@ प्रचलन में एल-बीटीसी src/app/dashboard/dashboard.component.html - 228,230 + 237,239 dashboard.lbtc-pegs-in-circulation + + mempool.space merely provides data about the Bitcoin network. It cannot help you with retrieving funds, confirming your transaction quicker, etc. + + src/app/docs/api-docs/api-docs.component.html + 13 + + + src/app/docs/api-docs/api-docs.component.html + 14 + + faq.big-disclaimer + REST API service src/app/docs/api-docs/api-docs.component.html - 39,40 + 42,43 api-docs.title @@ -4979,11 +5219,11 @@ ैंडपॉइन्ट src/app/docs/api-docs/api-docs.component.html - 48,49 + 51,52 src/app/docs/api-docs/api-docs.component.html - 102,105 + 105,108 Api docs endpoint @@ -4992,11 +5232,11 @@ विवरण src/app/docs/api-docs/api-docs.component.html - 67,68 + 70,71 src/app/docs/api-docs/api-docs.component.html - 106,107 + 109,110 @@ -5004,7 +5244,7 @@ डिफ़ॉल्ट पुश: क्रिया: 'चाहते हैं', डेटा: ['ब्लॉक', ...] जो आप चाहते हैं उसे व्यक्त करने के लिए धक्का दिया। उपलब्ध: ब्लॉक, मेमपूल-ब्लॉक, लाइव-2h-चार्ट, और आँकड़े। पते से संबंधित लेनदेन को पुश करें: 'ट्रैक-एड्रेस': '3PbJ...bF9B' इनपुट या आउटपुट के रूप में उस पते वाले सभी नए लेनदेन प्राप्त करने के लिए। लेन-देन की एक सरणी देता है। नए मेमपूल लेनदेन के लिए पता-लेनदेन, और नए ब्लॉक की पुष्टि लेनदेन के लिए ब्लॉक-लेनदेन। src/app/docs/api-docs/api-docs.component.html - 107,108 + 110,111 api-docs.websocket.websocket @@ -5098,7 +5338,7 @@ src/app/lightning/node/node.component.html - 180,182 + 183,185 shared.m-sats @@ -5166,7 +5406,11 @@ src/app/lightning/channels-list/channels-list.component.html - 120,121 + 123,124 + + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 lightning.x-channels @@ -5204,11 +5448,11 @@ src/app/lightning/channel/channel.component.html - 11,12 + 13,14 src/app/lightning/channels-list/channels-list.component.html - 65,66 + 68,69 status.inactive @@ -5220,11 +5464,11 @@ src/app/lightning/channel/channel.component.html - 12,13 + 14,15 src/app/lightning/channels-list/channels-list.component.html - 66,68 + 69,71 status.active @@ -5236,7 +5480,7 @@ src/app/lightning/channel/channel.component.html - 13,14 + 15,16 src/app/lightning/channels-list/channels-list.component.html @@ -5244,7 +5488,7 @@ src/app/lightning/channels-list/channels-list.component.html - 68,70 + 71,73 status.closed @@ -5256,7 +5500,7 @@ src/app/lightning/channel/channel.component.html - 29,30 + 36,37 lightning.created @@ -5268,11 +5512,19 @@ src/app/lightning/channel/channel.component.html - 48,49 + 55,56 src/app/lightning/channels-list/channels-list.component.html - 40,43 + 43,46 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 src/app/lightning/node-statistics/node-statistics.component.html @@ -5280,7 +5532,7 @@ src/app/lightning/node-statistics/node-statistics.component.html - 47,50 + 46,49 src/app/lightning/nodes-list/nodes-list.component.html @@ -5302,6 +5554,10 @@ src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 60,62 + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 13,14 + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 202,201 @@ -5336,11 +5592,11 @@ Lightning channel src/app/lightning/channel/channel.component.html - 2,5 + 4,7 src/app/lightning/channel/channel.component.html - 117,119 + 116,118 lightning.channel @@ -5348,11 +5604,11 @@ Last update src/app/lightning/channel/channel.component.html - 33,34 + 40,41 src/app/lightning/node/node.component.html - 73,75 + 76,78 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5368,11 +5624,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 14,15 + 16,17 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 14,15 + 16,17 lightning.last-update @@ -5380,11 +5636,11 @@ Closing date src/app/lightning/channel/channel.component.html - 37,38 + 44,45 src/app/lightning/channels-list/channels-list.component.html - 39,40 + 42,44 lightning.closing_date @@ -5392,7 +5648,7 @@ Closed by src/app/lightning/channel/channel.component.html - 52,54 + 59,61 lightning.closed_by @@ -5400,7 +5656,7 @@ Opening transaction src/app/lightning/channel/channel.component.html - 84,85 + 91,92 lightning.opening-transaction @@ -5408,7 +5664,7 @@ Closing transaction src/app/lightning/channel/channel.component.html - 93,95 + 100,102 lightning.closing-transaction @@ -5419,6 +5675,27 @@ 37 + + Mutually closed + + src/app/lightning/channel/closing-type/closing-type.component.ts + 20 + + + + Force closed + + src/app/lightning/channel/closing-type/closing-type.component.ts + 24 + + + + Force closed with penalty + + src/app/lightning/channel/closing-type/closing-type.component.ts + 28 + + Open @@ -5431,7 +5708,7 @@ No channels to display src/app/lightning/channels-list/channels-list.component.html - 29,35 + 29,37 lightning.empty-channels-list @@ -5439,7 +5716,7 @@ Alias src/app/lightning/channels-list/channels-list.component.html - 35,37 + 38,40 src/app/lightning/group/group.component.html @@ -5463,11 +5740,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 10,11 + 11,12 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 10,12 + 11,13 lightning.alias @@ -5475,7 +5752,7 @@ Status src/app/lightning/channels-list/channels-list.component.html - 37,38 + 40,41 status @@ -5483,7 +5760,7 @@ Channel ID src/app/lightning/channels-list/channels-list.component.html - 41,45 + 44,48 channels.id @@ -5491,11 +5768,11 @@ sats src/app/lightning/channels-list/channels-list.component.html - 60,64 + 63,68 src/app/lightning/channels-list/channels-list.component.html - 84,88 + 87,91 src/app/lightning/channels-statistics/channels-statistics.component.html @@ -5539,6 +5816,22 @@ shared.sats + + avg + + src/app/lightning/channels-statistics/channels-statistics.component.html + 3,5 + + statistics.average-small + + + med + + src/app/lightning/channels-statistics/channels-statistics.component.html + 6,9 + + statistics.median-small + Avg Capacity @@ -5655,11 +5948,11 @@ src/app/lightning/node-statistics/node-statistics.component.html - 17,18 + 16,17 src/app/lightning/node-statistics/node-statistics.component.html - 54,57 + 53,56 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -5707,10 +6000,6 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 11,12 - - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html 12,13 lightning.liquidity @@ -5726,12 +6015,20 @@ 40,44 - src/app/lightning/node-statistics/node-statistics.component.html - 29,30 + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 src/app/lightning/node-statistics/node-statistics.component.html - 61,64 + 28,29 + + + src/app/lightning/node-statistics/node-statistics.component.html + 60,63 src/app/lightning/nodes-list/nodes-list.component.html @@ -5763,16 +6060,20 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 12,13 + 14,15 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 11,12 + 12,13 src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -5803,7 +6104,7 @@ src/app/lightning/node/node.component.html - 47,49 + 50,52 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5819,11 +6120,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 15,17 + 17,20 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 15,17 + 17,20 lightning.location @@ -5857,9 +6158,17 @@ src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 62 + + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html + 4,9 + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.ts - 29 + 33 + + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 4,9 src/app/lightning/nodes-rankings-dashboard/nodes-rankings-dashboard.component.html @@ -5887,6 +6196,28 @@ lightning.node-fee-distribution + + Outgoing Fees + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 170 + + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 208 + + + + Incoming Fees + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 178 + + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 222 + + Percentage change past week @@ -5895,11 +6226,11 @@ src/app/lightning/node-statistics/node-statistics.component.html - 18,20 + 17,19 src/app/lightning/node-statistics/node-statistics.component.html - 30,32 + 29,31 mining.percentage-change-last-week @@ -5911,11 +6242,11 @@ src/app/lightning/node/node.component.html - 2,4 + 4,6 src/app/lightning/node/node.component.html - 260,262 + 263,265 lightning.node @@ -5927,7 +6258,7 @@ src/app/lightning/node/node.component.html - 27,30 + 30,33 lightning.active-capacity @@ -5939,7 +6270,7 @@ src/app/lightning/node/node.component.html - 34,38 + 37,41 lightning.active-channels @@ -5951,19 +6282,11 @@ country - - No node found for public key "" - - src/app/lightning/node/node.component.html - 17,19 - - lightning.node-not-found - Average channel size src/app/lightning/node/node.component.html - 40,43 + 43,46 lightning.active-channels-avg @@ -5971,7 +6294,7 @@ Avg channel distance src/app/lightning/node/node.component.html - 56,57 + 59,60 lightning.avg-distance @@ -5979,7 +6302,7 @@ Color src/app/lightning/node/node.component.html - 79,81 + 82,84 lightning.color @@ -5987,7 +6310,7 @@ ISP src/app/lightning/node/node.component.html - 86,87 + 89,90 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html @@ -5999,7 +6322,7 @@ Exclusively on Tor src/app/lightning/node/node.component.html - 93,95 + 96,98 tor @@ -6007,7 +6330,7 @@ Liquidity ad src/app/lightning/node/node.component.html - 138,141 + 141,144 node.liquidity-ad @@ -6015,7 +6338,7 @@ Lease fee rate src/app/lightning/node/node.component.html - 144,147 + 147,150 Liquidity ad lease fee rate liquidity-ad.lease-fee-rate @@ -6024,7 +6347,7 @@ Lease base fee src/app/lightning/node/node.component.html - 152,154 + 155,157 liquidity-ad.lease-base-fee @@ -6032,7 +6355,7 @@ Funding weight src/app/lightning/node/node.component.html - 158,159 + 161,162 liquidity-ad.funding-weight @@ -6040,7 +6363,7 @@ Channel fee rate src/app/lightning/node/node.component.html - 168,171 + 171,174 Liquidity ad channel fee rate liquidity-ad.channel-fee-rate @@ -6049,7 +6372,7 @@ Channel base fee src/app/lightning/node/node.component.html - 176,178 + 179,181 liquidity-ad.channel-base-fee @@ -6057,7 +6380,7 @@ Compact lease src/app/lightning/node/node.component.html - 188,190 + 191,193 liquidity-ad.compact-lease @@ -6065,7 +6388,7 @@ TLV extension records src/app/lightning/node/node.component.html - 199,202 + 202,205 node.tlv.records @@ -6073,7 +6396,7 @@ Open channels src/app/lightning/node/node.component.html - 240,243 + 243,246 lightning.open-channels @@ -6081,7 +6404,7 @@ Closed channels src/app/lightning/node/node.component.html - 244,247 + 247,250 lightning.open-channels @@ -6123,7 +6446,7 @@ No geolocation data available src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts - 218,213 + 219,214 @@ -6145,8 +6468,8 @@ 112,107 - - Reachable on Clearnet Only + + Clearnet and Darknet src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -6156,8 +6479,8 @@ 303,302 - - Reachable on Clearnet and Darknet + + Clearnet Only (IPv4, IPv6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -6167,8 +6490,8 @@ 295,294 - - Reachable on Darknet Only + + Darknet Only (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -6191,25 +6514,29 @@ lightning.share - nodes + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 BTC capacity src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6315,11 +6642,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 @@ -6400,22 +6727,6 @@ 27 - - Top 100 nodes liquidity ranking - - src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 3,7 - - lightning.top-100-liquidity - - - Top 100 nodes connectivity ranking - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 3,7 - - lightning.top-100-connectivity - Oldest nodes diff --git a/frontend/src/locale/messages.hr.xlf b/frontend/src/locale/messages.hr.xlf index 4b0691fe3..4d6ea4e03 100644 --- a/frontend/src/locale/messages.hr.xlf +++ b/frontend/src/locale/messages.hr.xlf @@ -322,11 +322,11 @@ src/app/components/block/block.component.html - 290,291 + 310,311 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 26,27 + 46,47 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -346,11 +346,11 @@ src/app/components/block/block.component.html - 291,292 + 311,312 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 27,28 + 47,48 src/app/components/mempool-blocks/mempool-blocks.component.html @@ -385,7 +385,7 @@ src/app/components/block/block.component.html - 40,41 + 38,39 block.hash @@ -409,7 +409,7 @@ src/app/components/block/block.component.html - 44,46 + 42,44 src/app/components/blocks-list/blocks-list.component.html @@ -545,11 +545,11 @@ src/app/components/master-page/master-page.component.html - 49,51 + 48,50 src/app/components/pool-ranking/pool-ranking.component.html - 94,96 + 94,95 @@ -690,11 +690,11 @@ src/app/components/mining-dashboard/mining-dashboard.component.html - 33 + 32 src/app/components/mining-dashboard/mining-dashboard.component.html - 43 + 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -714,16 +714,24 @@ src/app/components/about/about.component.html - 385,389 + 391,394 + + + src/app/components/mining-dashboard/mining-dashboard.component.html + 87 src/app/dashboard/dashboard.component.html - 150,152 + 157,159 src/app/docs/docs/docs.component.html 51 + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 97 + Terms of Service shared.terms-of-service @@ -733,14 +741,22 @@ src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html 113,120 + + src/app/components/mining-dashboard/mining-dashboard.component.html + 89 + src/app/dashboard/dashboard.component.html - 152,154 + 159,161 src/app/docs/docs/docs.component.html 53 + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 99 + Privacy Policy shared.privacy-policy @@ -915,7 +931,7 @@ src/app/dashboard/dashboard.component.html - 124,125 + 124,126 @@ -959,7 +975,7 @@ src/app/components/transaction/transaction.component.html - 158,160 + 152,154 src/app/components/transactions-list/transactions-list.component.html @@ -974,11 +990,11 @@ src/app/components/block/block.component.html - 246,247 + 252,253 src/app/components/transaction/transaction.component.html - 288,290 + 283,285 transaction.version @@ -1027,7 +1043,7 @@ src/app/components/transactions-list/transactions-list.component.html - 294,295 + 296,297 Transaction singular confirmation count shared.confirmation-count.singular @@ -1048,7 +1064,7 @@ src/app/components/transactions-list/transactions-list.component.html - 295,296 + 297,298 Transaction plural confirmation count shared.confirmation-count.plural @@ -1060,10 +1076,6 @@ src/app/bisq/bisq-transaction/bisq-transaction.component.html 43,45 - - src/app/components/transaction/transaction.component.html - 65,67 - Transaction included in block transaction.included-in-block @@ -1075,11 +1087,11 @@ src/app/components/transaction/transaction.component.html - 77,80 + 71,74 src/app/components/transaction/transaction.component.html - 135,138 + 129,132 Transaction features transaction.features @@ -1107,11 +1119,11 @@ src/app/components/transaction/transaction.component.html - 262,267 + 257,262 src/app/components/transaction/transaction.component.html - 406,412 + 401,407 transaction.details @@ -1128,11 +1140,11 @@ src/app/components/transaction/transaction.component.html - 249,253 + 244,248 src/app/components/transaction/transaction.component.html - 377,383 + 372,378 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1149,7 +1161,7 @@ src/app/components/transaction/transaction.component.ts - 241,240 + 246,245 @@ -1167,7 +1179,7 @@ src/app/components/transaction/transaction.component.html - 159,160 + 153,154 src/app/dashboard/dashboard.component.html @@ -1183,7 +1195,7 @@ src/app/components/transaction/transaction.component.html - 72,73 + 66,67 Transaction Confirmed state transaction.confirmed @@ -1334,14 +1346,14 @@ Our mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, completely self-hosted without any trusted third-parties. src/app/components/about/about.component.html - 13,17 + 13,16 Enterprise Sponsors 🚀 src/app/components/about/about.component.html - 29,32 + 19,22 about.sponsors.enterprise.withRocket @@ -1349,7 +1361,7 @@ Community Sponsors ❤️ src/app/components/about/about.component.html - 177,180 + 167,170 about.sponsors.withHeart @@ -1357,7 +1369,7 @@ Community Integrations src/app/components/about/about.component.html - 191,193 + 181,183 about.community-integrations @@ -1365,7 +1377,7 @@ Community Alliances src/app/components/about/about.component.html - 285,287 + 291,293 about.alliances @@ -1373,7 +1385,7 @@ Project Translators src/app/components/about/about.component.html - 301,303 + 307,309 about.translators @@ -1381,7 +1393,7 @@ Project Contributors src/app/components/about/about.component.html - 315,317 + 321,323 about.contributors @@ -1389,7 +1401,7 @@ Project Members src/app/components/about/about.component.html - 327,329 + 333,335 about.project_members @@ -1397,7 +1409,7 @@ Project Maintainers src/app/components/about/about.component.html - 340,342 + 346,348 about.maintainers @@ -1405,7 +1417,7 @@ About src/app/components/about/about.component.ts - 39 + 42 src/app/components/bisq-master-page/bisq-master-page.component.html @@ -1417,7 +1429,7 @@ src/app/components/master-page/master-page.component.html - 58,61 + 57,60 @@ -1451,7 +1463,7 @@ src/app/components/amount/amount.component.html - 6,9 + 18,21 src/app/components/asset-circulation/asset-circulation.component.html @@ -1467,7 +1479,7 @@ src/app/components/transactions-list/transactions-list.component.html - 302,304 + 304,306 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -1543,7 +1555,7 @@ src/app/components/assets/assets.component.html - 29,31 + 31,33 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -1746,7 +1758,7 @@ src/app/components/assets/assets.component.html - 30,31 + 32,33 Asset ticker header @@ -1758,7 +1770,7 @@ src/app/components/assets/assets.component.html - 31,34 + 33,36 Asset Issuer Domain header @@ -1770,7 +1782,7 @@ src/app/components/assets/assets.component.html - 32,36 + 34,38 Asset ID header @@ -1778,7 +1790,7 @@ Error loading assets data. src/app/components/assets/assets.component.html - 48,53 + 50,55 Asset data load error @@ -1878,7 +1890,7 @@ src/app/components/graphs/graphs.component.html - 18 + 17 mining.block-fee-rates @@ -1894,7 +1906,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 161 + 165 @@ -1909,7 +1921,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 163 + 167 @@ -1920,11 +1932,11 @@ src/app/components/block-fees-graph/block-fees-graph.component.ts - 62 + 67 src/app/components/graphs/graphs.component.html - 20 + 19 mining.block-fees @@ -1932,19 +1944,19 @@ Indexing blocks src/app/components/block-fees-graph/block-fees-graph.component.ts - 110,105 + 116,111 src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 108,103 + 113,108 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 115,110 + 116,111 src/app/components/hashrate-chart/hashrate-chart.component.ts - 171,166 + 178,173 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -1984,7 +1996,7 @@ src/app/components/transaction/transaction.component.html - 476 + 473 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2009,11 +2021,11 @@ src/app/components/transaction/transaction.component.html - 476,477 + 473 src/app/components/transactions-list/transactions-list.component.html - 286,287 + 288 sat shared.sat @@ -2026,11 +2038,11 @@ src/app/components/transaction/transaction.component.html - 161,165 + 155,159 src/app/components/transaction/transaction.component.html - 479,481 + 476,478 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2042,7 +2054,7 @@ src/app/lightning/channels-list/channels-list.component.html - 38,39 + 41,43 Transaction fee rate transaction.fee-rate @@ -2060,19 +2072,19 @@ src/app/components/block/block.component.html - 125,128 + 124,127 src/app/components/block/block.component.html - 129 + 128,130 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 12,14 + 19,22 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 15,17 + 30,33 src/app/components/fees-box/fees-box.component.html @@ -2112,27 +2124,27 @@ src/app/components/transaction/transaction.component.html - 173,174 + 167,168 src/app/components/transaction/transaction.component.html - 184,185 + 178,179 src/app/components/transaction/transaction.component.html - 195,196 + 189,190 src/app/components/transaction/transaction.component.html - 481,484 + 478,481 src/app/components/transaction/transaction.component.html - 492,494 + 489,491 src/app/components/transactions-list/transactions-list.component.html - 286 + 286,287 src/app/dashboard/dashboard.component.html @@ -2140,7 +2152,7 @@ src/app/dashboard/dashboard.component.html - 204,208 + 213,217 sat/vB shared.sat-vbyte @@ -2154,11 +2166,11 @@ src/app/components/transaction/transaction.component.html - 160,162 + 154,156 src/app/components/transaction/transaction.component.html - 274,277 + 269,272 Transaction Virtual Size transaction.vsize @@ -2227,7 +2239,7 @@ src/app/components/graphs/graphs.component.html - 26 + 25 mining.block-prediction-accuracy @@ -2261,11 +2273,11 @@ src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 60 + 65 src/app/components/graphs/graphs.component.html - 22 + 21 mining.block-rewards @@ -2281,7 +2293,7 @@ src/app/components/graphs/graphs.component.html - 24 + 23 mining.block-sizes-weights @@ -2289,15 +2301,15 @@ Size src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 180,179 + 184,183 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 226,224 + 239,237 src/app/components/block/block.component.html - 50,52 + 48,50 src/app/components/blocks-list/blocks-list.component.html @@ -2321,7 +2333,7 @@ src/app/components/transaction/transaction.component.html - 270,272 + 265,267 src/app/dashboard/dashboard.component.html @@ -2332,11 +2344,11 @@ Weight src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 188,187 + 192,191 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 257,254 + 270,267 src/app/components/block/block-preview.component.html @@ -2344,11 +2356,22 @@ src/app/components/block/block.component.html - 54,56 + 52,54 src/app/components/transaction/transaction.component.html - 278,280 + 273,275 + + + + Size per weight + + src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts + 200,199 + + + src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts + 282,279 @@ -2363,14 +2386,6 @@ shared.block-title - - - - src/app/components/block/block-preview.component.html - 11,12 - - shared.block-title - Median fee @@ -2379,7 +2394,7 @@ src/app/components/block/block.component.html - 128,129 + 127,128 src/app/components/mempool-block/mempool-block.component.html @@ -2395,11 +2410,11 @@ src/app/components/block/block.component.html - 133,135 + 138,140 src/app/components/block/block.component.html - 159,162 + 164,167 src/app/components/mempool-block/mempool-block.component.html @@ -2416,7 +2431,7 @@ src/app/components/block/block.component.html - 168,170 + 173,175 block.miner @@ -2428,7 +2443,7 @@ src/app/components/block/block.component.ts - 227 + 242 @@ -2437,6 +2452,10 @@ src/app/components/block/block.component.html 8,9 + + src/app/components/difficulty/difficulty-tooltip.component.html + 38 + src/app/components/mempool-block/mempool-block.component.ts 75 @@ -2451,31 +2470,47 @@ Previous Block - - Block health + + Health src/app/components/block/block.component.html - 58,61 + 56 - block.health + + src/app/components/blocks-list/blocks-list.component.html + 18,19 + + + src/app/components/blocks-list/blocks-list.component.html + 18,19 + + latest-blocks.health Unknown src/app/components/block/block.component.html - 69,72 + 67,70 src/app/components/blocks-list/blocks-list.component.html 60,63 - src/app/lightning/node/node.component.html - 52,55 + src/app/components/pool-ranking/pool-ranking.component.html + 121,124 + + + src/app/lightning/channel/closing-type/closing-type.component.ts + 32 src/app/lightning/node/node.component.html - 96,100 + 55,58 + + + src/app/lightning/node/node.component.html + 99,103 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts @@ -2491,7 +2526,7 @@ Fee span src/app/components/block/block.component.html - 124,125 + 123,124 src/app/components/mempool-block/mempool-block.component.html @@ -2503,7 +2538,7 @@ Based on average native segwit transaction of 140 vBytes src/app/components/block/block.component.html - 129,131 + 131,136 src/app/components/fees-box/fees-box.component.html @@ -2527,48 +2562,60 @@ Transaction fee tooltip - - Subsidy + fees: + + Subsidy + fees src/app/components/block/block.component.html - 148,151 + 153,156 src/app/components/block/block.component.html - 163,167 + 168,172 Total subsidy and fees in a block block.subsidy-and-fees - - Projected + + Expected src/app/components/block/block.component.html - 210,212 + 216 - block.projected + block.expected + + + beta + + src/app/components/block/block.component.html + 216,217 + + + src/app/components/block/block.component.html + 222,224 + + beta Actual src/app/components/block/block.component.html - 212,216 + 218,222 block.actual - - Projected Block + + Expected Block src/app/components/block/block.component.html - 216,218 + 222 - block.projected-block + block.expected-block Actual Block src/app/components/block/block.component.html - 225,227 + 231 block.actual-block @@ -2576,7 +2623,7 @@ Bits src/app/components/block/block.component.html - 250,252 + 256,258 block.bits @@ -2584,7 +2631,7 @@ Merkle root src/app/components/block/block.component.html - 254,256 + 260,262 block.merkle-root @@ -2592,7 +2639,7 @@ Difficulty src/app/components/block/block.component.html - 265,268 + 271,274 src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html @@ -2608,11 +2655,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 284,283 + 291,290 src/app/components/hashrate-chart/hashrate-chart.component.ts - 371,368 + 378,375 block.difficulty @@ -2620,7 +2667,7 @@ Nonce src/app/components/block/block.component.html - 269,271 + 275,277 block.nonce @@ -2628,32 +2675,41 @@ Block Header Hex src/app/components/block/block.component.html - 273,274 + 279,280 block.header + + Audit + + src/app/components/block/block.component.html + 297,301 + + Toggle Audit + block.toggle-audit + Details Detalji src/app/components/block/block.component.html - 284,288 + 304,308 src/app/components/transaction/transaction.component.html - 254,259 + 249,254 src/app/lightning/channel/channel.component.html - 86,88 + 93,95 src/app/lightning/channel/channel.component.html - 96,98 + 103,105 src/app/lightning/node/node.component.html - 218,222 + 221,225 Transaction Details transaction.details @@ -2662,20 +2718,16 @@ Error loading data. src/app/components/block/block.component.html - 303,305 + 323,325 src/app/components/block/block.component.html - 339,343 + 362,366 src/app/lightning/channel/channel-preview.component.html 70,75 - - src/app/lightning/channel/channel.component.html - 109,115 - src/app/lightning/node/node-preview.component.html 66,69 @@ -2690,7 +2742,7 @@ Why is this block empty? src/app/components/block/block.component.html - 361,367 + 384,390 block.empty-block-explanation @@ -2734,18 +2786,6 @@ latest-blocks.mined - - Health - - src/app/components/blocks-list/blocks-list.component.html - 18,19 - - - src/app/components/blocks-list/blocks-list.component.html - 18,19 - - latest-blocks.health - Reward @@ -2806,7 +2846,7 @@ src/app/dashboard/dashboard.component.html - 210,214 + 219,223 dashboard.txs @@ -2835,24 +2875,28 @@ Difficulty Adjustment + + src/app/components/difficulty-mining/difficulty-mining.component.html + 1,5 + src/app/components/difficulty/difficulty.component.html 1,5 src/app/components/mining-dashboard/mining-dashboard.component.html - 24 + 23 dashboard.difficulty-adjustment Remaining - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 7,9 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 66,69 difficulty-box.remaining @@ -2860,11 +2904,11 @@ blocks - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 10,11 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 53,54 @@ -2884,11 +2928,11 @@ block - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 11,12 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 54,55 @@ -2900,11 +2944,11 @@ Estimate - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 16,17 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 73,76 difficulty-box.estimate @@ -2912,19 +2956,23 @@ Previous - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 31,33 + + src/app/components/difficulty/difficulty.component.html + 59,61 + difficulty-box.previous Current Period - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 43,44 - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 80,83 difficulty-box.current-period @@ -2932,11 +2980,99 @@ Next Halving - src/app/components/difficulty/difficulty.component.html + src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 difficulty-box.next-halving + + blocks expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 13 + + difficulty-box.expected-blocks + + + block expected + + src/app/components/difficulty/difficulty-tooltip.component.html + 14 + + difficulty-box.expected-block + + + blocks mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 18 + + difficulty-box.mined-blocks + + + block mined + + src/app/components/difficulty/difficulty-tooltip.component.html + 19 + + difficulty-box.mined-block + + + blocks remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 24 + + difficulty-box.remaining-blocks + + + block remaining + + src/app/components/difficulty/difficulty-tooltip.component.html + 25 + + difficulty-box.remaining-block + + + blocks ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 29 + + difficulty-box.blocks-ahead + + + block ahead + + src/app/components/difficulty/difficulty-tooltip.component.html + 30 + + difficulty-box.block-ahead + + + blocks behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 34 + + difficulty-box.blocks-behind + + + block behind + + src/app/components/difficulty/difficulty-tooltip.component.html + 35 + + difficulty-box.block-behind + + + Average block time + + src/app/components/difficulty/difficulty.component.html + 42,45 + + difficulty-box.average-block-time + Either 2x the minimum, or the Low Priority rate (whichever is lower) @@ -3025,7 +3161,7 @@ src/app/dashboard/dashboard.component.html - 237,238 + 246,247 dashboard.incoming-transactions @@ -3037,7 +3173,7 @@ src/app/dashboard/dashboard.component.html - 240,243 + 249,252 dashboard.backend-is-synchronizing @@ -3049,7 +3185,7 @@ src/app/dashboard/dashboard.component.html - 245,250 + 254,259 vB/s shared.vbytes-per-second @@ -3062,7 +3198,7 @@ src/app/dashboard/dashboard.component.html - 208,209 + 217,218 Unconfirmed count dashboard.unconfirmed @@ -3080,7 +3216,7 @@ Mining src/app/components/graphs/graphs.component.html - 8 + 7 mining @@ -3088,7 +3224,7 @@ Pools Ranking src/app/components/graphs/graphs.component.html - 11 + 10 src/app/components/pool-ranking/pool-ranking.component.html @@ -3100,7 +3236,7 @@ Pools Dominance src/app/components/graphs/graphs.component.html - 13 + 12 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.html @@ -3112,7 +3248,7 @@ Hashrate & Difficulty src/app/components/graphs/graphs.component.html - 15,16 + 14,15 mining.hashrate-difficulty @@ -3120,7 +3256,7 @@ Lightning src/app/components/graphs/graphs.component.html - 31 + 30 lightning @@ -3128,7 +3264,7 @@ Lightning Nodes Per Network src/app/components/graphs/graphs.component.html - 34 + 33 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.html @@ -3148,7 +3284,7 @@ Lightning Network Capacity src/app/components/graphs/graphs.component.html - 36 + 35 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -3168,7 +3304,7 @@ Lightning Nodes Per ISP src/app/components/graphs/graphs.component.html - 38 + 37 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -3180,7 +3316,7 @@ Lightning Nodes Per Country src/app/components/graphs/graphs.component.html - 40 + 39 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -3196,7 +3332,7 @@ Lightning Nodes World Map src/app/components/graphs/graphs.component.html - 42 + 41 src/app/lightning/nodes-map/nodes-map.component.html @@ -3212,7 +3348,7 @@ Lightning Nodes Channels World Map src/app/components/graphs/graphs.component.html - 44 + 43 src/app/lightning/nodes-channels-map/nodes-channels-map.component.html @@ -3232,11 +3368,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 273,272 + 280,279 src/app/components/hashrate-chart/hashrate-chart.component.ts - 359,356 + 366,363 src/app/components/pool-ranking/pool-ranking.component.html @@ -3264,11 +3400,11 @@ Hashrate (MA) src/app/components/hashrate-chart/hashrate-chart.component.ts - 292,291 + 299,298 src/app/components/hashrate-chart/hashrate-chart.component.ts - 382,380 + 389,387 @@ -3300,7 +3436,7 @@ src/app/components/master-page/master-page.component.html - 52,54 + 51,53 src/app/components/statistics/statistics.component.ts @@ -3324,7 +3460,7 @@ Lightning Explorer src/app/components/master-page/master-page.component.html - 44,45 + 44,47 src/app/lightning/lightning-dashboard/lightning-dashboard.component.ts @@ -3332,19 +3468,11 @@ master-page.lightning - - beta - - src/app/components/master-page/master-page.component.html - 45,48 - - beta - Documentation src/app/components/master-page/master-page.component.html - 55,57 + 54,56 src/app/docs/docs/docs.component.html @@ -3384,7 +3512,7 @@ Reward stats src/app/components/mining-dashboard/mining-dashboard.component.html - 10 + 9 mining.reward-stats @@ -3392,7 +3520,7 @@ (144 blocks) src/app/components/mining-dashboard/mining-dashboard.component.html - 11 + 10 mining.144-blocks @@ -3400,7 +3528,7 @@ Latest blocks src/app/components/mining-dashboard/mining-dashboard.component.html - 53 + 52 src/app/dashboard/dashboard.component.html @@ -3412,10 +3540,35 @@ Adjustments src/app/components/mining-dashboard/mining-dashboard.component.html - 67 + 66 dashboard.adjustments + + Broadcast Transaction + + src/app/components/mining-dashboard/mining-dashboard.component.html + 91 + + + src/app/components/push-transaction/push-transaction.component.html + 2 + + + src/app/components/push-transaction/push-transaction.component.html + 8 + + + src/app/dashboard/dashboard.component.html + 161,169 + + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 102 + + Broadcast Transaction + shared.broadcast-transaction + Pools luck (1 week) @@ -3476,7 +3629,7 @@ src/app/components/pool-ranking/pool-ranking.component.html - 136,138 + 152,154 master-page.blocks @@ -3504,11 +3657,23 @@ mining.rank + + Avg Health + + src/app/components/pool-ranking/pool-ranking.component.html + 96,97 + + + src/app/components/pool-ranking/pool-ranking.component.html + 96,98 + + latest-blocks.avg_health + Empty blocks src/app/components/pool-ranking/pool-ranking.component.html - 95,98 + 97,100 mining.empty-blocks @@ -3516,7 +3681,7 @@ All miners src/app/components/pool-ranking/pool-ranking.component.html - 113,114 + 129,130 mining.all-miners @@ -3524,7 +3689,7 @@ Pools Luck (1w) src/app/components/pool-ranking/pool-ranking.component.html - 130,132 + 146,148 mining.miners-luck @@ -3532,7 +3697,7 @@ Pools Count (1w) src/app/components/pool-ranking/pool-ranking.component.html - 142,144 + 158,160 mining.miners-count @@ -3540,11 +3705,11 @@ Mining Pools src/app/components/pool-ranking/pool-ranking.component.ts - 57 + 58 - - blocks + + blocks src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3553,6 +3718,41 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -3754,23 +3954,6 @@ latest-blocks.coinbasetag - - Broadcast Transaction - - src/app/components/push-transaction/push-transaction.component.html - 2 - - - src/app/components/push-transaction/push-transaction.component.html - 8 - - - src/app/dashboard/dashboard.component.html - 154,161 - - Broadcast Transaction - shared.broadcast-transaction - Transaction hex @@ -3779,7 +3962,7 @@ src/app/components/transaction/transaction.component.html - 296,297 + 291,292 transaction.hex @@ -3893,6 +4076,70 @@ search-form.search-title + + Bitcoin Block Height + + src/app/components/search-form/search-results/search-results.component.html + 3 + + search.bitcoin-block-height + + + Bitcoin Transaction + + src/app/components/search-form/search-results/search-results.component.html + 9 + + search.bitcoin-transaction + + + Bitcoin Address + + src/app/components/search-form/search-results/search-results.component.html + 15 + + search.bitcoin-address + + + Bitcoin Block + + src/app/components/search-form/search-results/search-results.component.html + 21 + + search.bitcoin-block + + + Bitcoin Addresses + + src/app/components/search-form/search-results/search-results.component.html + 27 + + search.bitcoin-addresses + + + Lightning Nodes + + src/app/components/search-form/search-results/search-results.component.html + 35 + + search.lightning-nodes + + + Lightning Channels + + src/app/components/search-form/search-results/search-results.component.html + 43 + + search.lightning-channels + + + Go to "" + + src/app/components/search-form/search-results/search-results.component.html + 52 + + search.go-to + Mempool by vBytes (sat/vByte) @@ -3917,7 +4164,7 @@ Filter src/app/components/statistics/statistics.component.html - 57 + 60 statistics.component-filter.title @@ -3925,7 +4172,7 @@ Invert src/app/components/statistics/statistics.component.html - 76 + 79 statistics.component-invert.title @@ -3933,200 +4180,192 @@ Transaction vBytes per second (vB/s) src/app/components/statistics/statistics.component.html - 96 + 99 statistics.transaction-vbytes-per-second Just now - src/app/components/time-since/time-since.component.ts - 64 - - - src/app/components/time-span/time-span.component.ts - 57 + src/app/components/time/time.component.ts + 79 ago - src/app/components/time-since/time-since.component.ts - 74 + src/app/components/time/time.component.ts + 103 - src/app/components/time-since/time-since.component.ts - 75 + src/app/components/time/time.component.ts + 104 - src/app/components/time-since/time-since.component.ts - 76 + src/app/components/time/time.component.ts + 105 - src/app/components/time-since/time-since.component.ts - 77 + src/app/components/time/time.component.ts + 106 - src/app/components/time-since/time-since.component.ts - 78 + src/app/components/time/time.component.ts + 107 - src/app/components/time-since/time-since.component.ts - 79 + src/app/components/time/time.component.ts + 108 - src/app/components/time-since/time-since.component.ts - 80 + src/app/components/time/time.component.ts + 109 - src/app/components/time-since/time-since.component.ts - 84 + src/app/components/time/time.component.ts + 113 - src/app/components/time-since/time-since.component.ts - 85 + src/app/components/time/time.component.ts + 114 - src/app/components/time-since/time-since.component.ts - 86 + src/app/components/time/time.component.ts + 115 - src/app/components/time-since/time-since.component.ts - 87 + src/app/components/time/time.component.ts + 116 - src/app/components/time-since/time-since.component.ts - 88 + src/app/components/time/time.component.ts + 117 - src/app/components/time-since/time-since.component.ts - 89 + src/app/components/time/time.component.ts + 118 - src/app/components/time-since/time-since.component.ts - 90 + src/app/components/time/time.component.ts + 119 + + + + In ~ + + src/app/components/time/time.component.ts + 126 + + + src/app/components/time/time.component.ts + 127 + + + src/app/components/time/time.component.ts + 128 + + + src/app/components/time/time.component.ts + 129 + + + src/app/components/time/time.component.ts + 130 + + + src/app/components/time/time.component.ts + 131 + + + src/app/components/time/time.component.ts + 132 + + + src/app/components/time/time.component.ts + 136 + + + src/app/components/time/time.component.ts + 137 + + + src/app/components/time/time.component.ts + 138 + + + src/app/components/time/time.component.ts + 139 + + + src/app/components/time/time.component.ts + 140 + + + src/app/components/time/time.component.ts + 141 + + + src/app/components/time/time.component.ts + 142 After - src/app/components/time-span/time-span.component.ts - 67 + src/app/components/time/time.component.ts + 149 - src/app/components/time-span/time-span.component.ts - 68 + src/app/components/time/time.component.ts + 150 - src/app/components/time-span/time-span.component.ts - 69 + src/app/components/time/time.component.ts + 151 - src/app/components/time-span/time-span.component.ts - 70 + src/app/components/time/time.component.ts + 152 - src/app/components/time-span/time-span.component.ts - 71 + src/app/components/time/time.component.ts + 153 - src/app/components/time-span/time-span.component.ts - 72 + src/app/components/time/time.component.ts + 154 - src/app/components/time-span/time-span.component.ts - 73 + src/app/components/time/time.component.ts + 155 - src/app/components/time-span/time-span.component.ts - 77 + src/app/components/time/time.component.ts + 159 - src/app/components/time-span/time-span.component.ts - 78 + src/app/components/time/time.component.ts + 160 - src/app/components/time-span/time-span.component.ts - 79 + src/app/components/time/time.component.ts + 161 - src/app/components/time-span/time-span.component.ts - 80 + src/app/components/time/time.component.ts + 162 - src/app/components/time-span/time-span.component.ts - 81 + src/app/components/time/time.component.ts + 163 - src/app/components/time-span/time-span.component.ts - 82 + src/app/components/time/time.component.ts + 164 - src/app/components/time-span/time-span.component.ts - 83 - - - - In ~ - - src/app/components/time-until/time-until.component.ts - 66 - - - src/app/components/time-until/time-until.component.ts - 80 - - - src/app/components/time-until/time-until.component.ts - 81 - - - src/app/components/time-until/time-until.component.ts - 82 - - - src/app/components/time-until/time-until.component.ts - 83 - - - src/app/components/time-until/time-until.component.ts - 84 - - - src/app/components/time-until/time-until.component.ts - 85 - - - src/app/components/time-until/time-until.component.ts - 86 - - - src/app/components/time-until/time-until.component.ts - 90 - - - src/app/components/time-until/time-until.component.ts - 91 - - - src/app/components/time-until/time-until.component.ts - 92 - - - src/app/components/time-until/time-until.component.ts - 93 - - - src/app/components/time-until/time-until.component.ts - 94 - - - src/app/components/time-until/time-until.component.ts - 95 - - - src/app/components/time-until/time-until.component.ts - 96 + src/app/components/time/time.component.ts + 165 @@ -4166,7 +4405,7 @@ src/app/components/transactions-list/transactions-list.component.html - 298,301 + 300,303 Transaction unconfirmed state transaction.unconfirmed @@ -4176,11 +4415,11 @@ Prvo viđeno src/app/components/transaction/transaction.component.html - 108,109 + 102,103 src/app/lightning/node/node.component.html - 67,70 + 70,73 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -4196,11 +4435,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 13,15 + 15,16 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 13,15 + 15,16 Transaction first seen transaction.first-seen @@ -4209,7 +4448,7 @@ ETA src/app/components/transaction/transaction.component.html - 115,116 + 109,110 Transaction ETA transaction.eta @@ -4218,7 +4457,7 @@ In several hours (or more) src/app/components/transaction/transaction.component.html - 121,124 + 115,118 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -4227,11 +4466,11 @@ Descendant src/app/components/transaction/transaction.component.html - 168,170 + 162,164 src/app/components/transaction/transaction.component.html - 179,181 + 173,175 Descendant transaction.descendant @@ -4240,7 +4479,7 @@ Ancestor src/app/components/transaction/transaction.component.html - 190,192 + 184,186 Transaction Ancestor transaction.ancestor @@ -4249,11 +4488,11 @@ Flow src/app/components/transaction/transaction.component.html - 208,211 + 202,205 src/app/components/transaction/transaction.component.html - 346,350 + 341,345 Transaction flow transaction.flow @@ -4262,7 +4501,7 @@ Hide diagram src/app/components/transaction/transaction.component.html - 211,216 + 205,210 hide-diagram @@ -4270,7 +4509,7 @@ Show more src/app/components/transaction/transaction.component.html - 231,233 + 226,228 src/app/components/transactions-list/transactions-list.component.html @@ -4286,7 +4525,7 @@ Show less src/app/components/transaction/transaction.component.html - 233,239 + 228,234 src/app/components/transactions-list/transactions-list.component.html @@ -4298,7 +4537,7 @@ Show diagram src/app/components/transaction/transaction.component.html - 253,254 + 248,249 show-diagram @@ -4306,7 +4545,7 @@ Locktime src/app/components/transaction/transaction.component.html - 292,294 + 287,289 transaction.locktime @@ -4314,7 +4553,7 @@ Transaction not found. src/app/components/transaction/transaction.component.html - 455,456 + 450,451 transaction.error.transaction-not-found @@ -4322,7 +4561,7 @@ Waiting for it to appear in the mempool... src/app/components/transaction/transaction.component.html - 456,461 + 451,456 transaction.error.waiting-for-it-to-appear @@ -4330,7 +4569,7 @@ Effective fee rate src/app/components/transaction/transaction.component.html - 489,492 + 486,489 Effective transaction fee rate transaction.effective-fee-rate @@ -4463,7 +4702,7 @@ Show more inputs to reveal fee data src/app/components/transactions-list/transactions-list.component.html - 288,291 + 290,293 transactions-list.load-to-reveal-fee-info @@ -4471,7 +4710,7 @@ remaining src/app/components/transactions-list/transactions-list.component.html - 330,331 + 332,333 x-remaining @@ -4700,19 +4939,11 @@ dashboard.latest-transactions - - USD - - src/app/dashboard/dashboard.component.html - 126,127 - - dashboard.latest-transactions.USD - Minimum fee src/app/dashboard/dashboard.component.html - 201,202 + 210,211 Minimum mempool fee dashboard.minimum-fee @@ -4721,7 +4952,7 @@ Purging src/app/dashboard/dashboard.component.html - 202,203 + 211,212 Purgin below fee dashboard.purging @@ -4730,7 +4961,7 @@ Memory usage src/app/dashboard/dashboard.component.html - 214,215 + 223,224 Memory usage dashboard.memory-usage @@ -4739,15 +4970,27 @@ L-BTC in circulation src/app/dashboard/dashboard.component.html - 228,230 + 237,239 dashboard.lbtc-pegs-in-circulation + + mempool.space merely provides data about the Bitcoin network. It cannot help you with retrieving funds, confirming your transaction quicker, etc. + + src/app/docs/api-docs/api-docs.component.html + 13 + + + src/app/docs/api-docs/api-docs.component.html + 14 + + faq.big-disclaimer + REST API service src/app/docs/api-docs/api-docs.component.html - 39,40 + 42,43 api-docs.title @@ -4755,11 +4998,11 @@ Endpoint src/app/docs/api-docs/api-docs.component.html - 48,49 + 51,52 src/app/docs/api-docs/api-docs.component.html - 102,105 + 105,108 Api docs endpoint @@ -4767,18 +5010,18 @@ Description src/app/docs/api-docs/api-docs.component.html - 67,68 + 70,71 src/app/docs/api-docs/api-docs.component.html - 106,107 + 109,110 Default push: action: 'want', data: ['blocks', ...] to express what you want pushed. Available: blocks, mempool-blocks, live-2h-chart, and stats.Push transactions related to address: 'track-address': '3PbJ...bF9B' to receive all new transactions containing that address as input or output. Returns an array of transactions. address-transactions for new mempool transactions, and block-transactions for new block confirmed transactions. src/app/docs/api-docs/api-docs.component.html - 107,108 + 110,111 api-docs.websocket.websocket @@ -4868,7 +5111,7 @@ src/app/lightning/node/node.component.html - 180,182 + 183,185 shared.m-sats @@ -4936,7 +5179,11 @@ src/app/lightning/channels-list/channels-list.component.html - 120,121 + 123,124 + + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 lightning.x-channels @@ -4974,11 +5221,11 @@ src/app/lightning/channel/channel.component.html - 11,12 + 13,14 src/app/lightning/channels-list/channels-list.component.html - 65,66 + 68,69 status.inactive @@ -4990,11 +5237,11 @@ src/app/lightning/channel/channel.component.html - 12,13 + 14,15 src/app/lightning/channels-list/channels-list.component.html - 66,68 + 69,71 status.active @@ -5006,7 +5253,7 @@ src/app/lightning/channel/channel.component.html - 13,14 + 15,16 src/app/lightning/channels-list/channels-list.component.html @@ -5014,7 +5261,7 @@ src/app/lightning/channels-list/channels-list.component.html - 68,70 + 71,73 status.closed @@ -5026,7 +5273,7 @@ src/app/lightning/channel/channel.component.html - 29,30 + 36,37 lightning.created @@ -5038,11 +5285,19 @@ src/app/lightning/channel/channel.component.html - 48,49 + 55,56 src/app/lightning/channels-list/channels-list.component.html - 40,43 + 43,46 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 157 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 227 src/app/lightning/node-statistics/node-statistics.component.html @@ -5050,7 +5305,7 @@ src/app/lightning/node-statistics/node-statistics.component.html - 47,50 + 46,49 src/app/lightning/nodes-list/nodes-list.component.html @@ -5072,6 +5327,10 @@ src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 60,62 + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 13,14 + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 202,201 @@ -5106,11 +5365,11 @@ Lightning channel src/app/lightning/channel/channel.component.html - 2,5 + 4,7 src/app/lightning/channel/channel.component.html - 117,119 + 116,118 lightning.channel @@ -5118,11 +5377,11 @@ Last update src/app/lightning/channel/channel.component.html - 33,34 + 40,41 src/app/lightning/node/node.component.html - 73,75 + 76,78 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5138,11 +5397,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 14,15 + 16,17 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 14,15 + 16,17 lightning.last-update @@ -5150,11 +5409,11 @@ Closing date src/app/lightning/channel/channel.component.html - 37,38 + 44,45 src/app/lightning/channels-list/channels-list.component.html - 39,40 + 42,44 lightning.closing_date @@ -5162,7 +5421,7 @@ Closed by src/app/lightning/channel/channel.component.html - 52,54 + 59,61 lightning.closed_by @@ -5170,7 +5429,7 @@ Opening transaction src/app/lightning/channel/channel.component.html - 84,85 + 91,92 lightning.opening-transaction @@ -5178,7 +5437,7 @@ Closing transaction src/app/lightning/channel/channel.component.html - 93,95 + 100,102 lightning.closing-transaction @@ -5189,6 +5448,27 @@ 37 + + Mutually closed + + src/app/lightning/channel/closing-type/closing-type.component.ts + 20 + + + + Force closed + + src/app/lightning/channel/closing-type/closing-type.component.ts + 24 + + + + Force closed with penalty + + src/app/lightning/channel/closing-type/closing-type.component.ts + 28 + + Open @@ -5201,7 +5481,7 @@ No channels to display src/app/lightning/channels-list/channels-list.component.html - 29,35 + 29,37 lightning.empty-channels-list @@ -5209,7 +5489,7 @@ Alias src/app/lightning/channels-list/channels-list.component.html - 35,37 + 38,40 src/app/lightning/group/group.component.html @@ -5233,11 +5513,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 10,11 + 11,12 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 10,12 + 11,13 lightning.alias @@ -5245,7 +5525,7 @@ Status src/app/lightning/channels-list/channels-list.component.html - 37,38 + 40,41 status @@ -5253,7 +5533,7 @@ Channel ID src/app/lightning/channels-list/channels-list.component.html - 41,45 + 44,48 channels.id @@ -5261,11 +5541,11 @@ sats src/app/lightning/channels-list/channels-list.component.html - 60,64 + 63,68 src/app/lightning/channels-list/channels-list.component.html - 84,88 + 87,91 src/app/lightning/channels-statistics/channels-statistics.component.html @@ -5309,6 +5589,22 @@ shared.sats + + avg + + src/app/lightning/channels-statistics/channels-statistics.component.html + 3,5 + + statistics.average-small + + + med + + src/app/lightning/channels-statistics/channels-statistics.component.html + 6,9 + + statistics.median-small + Avg Capacity @@ -5425,11 +5721,11 @@ src/app/lightning/node-statistics/node-statistics.component.html - 17,18 + 16,17 src/app/lightning/node-statistics/node-statistics.component.html - 54,57 + 53,56 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -5477,10 +5773,6 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 11,12 - - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html 12,13 lightning.liquidity @@ -5496,12 +5788,20 @@ 40,44 - src/app/lightning/node-statistics/node-statistics.component.html - 29,30 + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 149 + + + src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts + 204 src/app/lightning/node-statistics/node-statistics.component.html - 61,64 + 28,29 + + + src/app/lightning/node-statistics/node-statistics.component.html + 60,63 src/app/lightning/nodes-list/nodes-list.component.html @@ -5533,16 +5833,20 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 12,13 + 14,15 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 11,12 + 12,13 src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -5573,7 +5877,7 @@ src/app/lightning/node/node.component.html - 47,49 + 50,52 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -5589,11 +5893,11 @@ src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 15,17 + 17,20 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 15,17 + 17,20 lightning.location @@ -5627,9 +5931,17 @@ src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 62 + + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html + 4,9 + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.ts - 29 + 33 + + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 4,9 src/app/lightning/nodes-rankings-dashboard/nodes-rankings-dashboard.component.html @@ -5657,6 +5969,28 @@ lightning.node-fee-distribution + + Outgoing Fees + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 170 + + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 208 + + + + Incoming Fees + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 178 + + + src/app/lightning/node-fee-chart/node-fee-chart.component.ts + 222 + + Percentage change past week @@ -5665,11 +5999,11 @@ src/app/lightning/node-statistics/node-statistics.component.html - 18,20 + 17,19 src/app/lightning/node-statistics/node-statistics.component.html - 30,32 + 29,31 mining.percentage-change-last-week @@ -5681,11 +6015,11 @@ src/app/lightning/node/node.component.html - 2,4 + 4,6 src/app/lightning/node/node.component.html - 260,262 + 263,265 lightning.node @@ -5697,7 +6031,7 @@ src/app/lightning/node/node.component.html - 27,30 + 30,33 lightning.active-capacity @@ -5709,7 +6043,7 @@ src/app/lightning/node/node.component.html - 34,38 + 37,41 lightning.active-channels @@ -5721,19 +6055,11 @@ country - - No node found for public key "" - - src/app/lightning/node/node.component.html - 17,19 - - lightning.node-not-found - Average channel size src/app/lightning/node/node.component.html - 40,43 + 43,46 lightning.active-channels-avg @@ -5741,7 +6067,7 @@ Avg channel distance src/app/lightning/node/node.component.html - 56,57 + 59,60 lightning.avg-distance @@ -5749,7 +6075,7 @@ Color src/app/lightning/node/node.component.html - 79,81 + 82,84 lightning.color @@ -5757,7 +6083,7 @@ ISP src/app/lightning/node/node.component.html - 86,87 + 89,90 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html @@ -5769,7 +6095,7 @@ Exclusively on Tor src/app/lightning/node/node.component.html - 93,95 + 96,98 tor @@ -5777,7 +6103,7 @@ Liquidity ad src/app/lightning/node/node.component.html - 138,141 + 141,144 node.liquidity-ad @@ -5785,7 +6111,7 @@ Lease fee rate src/app/lightning/node/node.component.html - 144,147 + 147,150 Liquidity ad lease fee rate liquidity-ad.lease-fee-rate @@ -5794,7 +6120,7 @@ Lease base fee src/app/lightning/node/node.component.html - 152,154 + 155,157 liquidity-ad.lease-base-fee @@ -5802,7 +6128,7 @@ Funding weight src/app/lightning/node/node.component.html - 158,159 + 161,162 liquidity-ad.funding-weight @@ -5810,7 +6136,7 @@ Channel fee rate src/app/lightning/node/node.component.html - 168,171 + 171,174 Liquidity ad channel fee rate liquidity-ad.channel-fee-rate @@ -5819,7 +6145,7 @@ Channel base fee src/app/lightning/node/node.component.html - 176,178 + 179,181 liquidity-ad.channel-base-fee @@ -5827,7 +6153,7 @@ Compact lease src/app/lightning/node/node.component.html - 188,190 + 191,193 liquidity-ad.compact-lease @@ -5835,7 +6161,7 @@ TLV extension records src/app/lightning/node/node.component.html - 199,202 + 202,205 node.tlv.records @@ -5843,7 +6169,7 @@ Open channels src/app/lightning/node/node.component.html - 240,243 + 243,246 lightning.open-channels @@ -5851,7 +6177,7 @@ Closed channels src/app/lightning/node/node.component.html - 244,247 + 247,250 lightning.open-channels @@ -5893,7 +6219,7 @@ No geolocation data available src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts - 218,213 + 219,214 @@ -5915,8 +6241,8 @@ 112,107 - - Reachable on Clearnet Only + + Clearnet and Darknet src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -5926,8 +6252,8 @@ 303,302 - - Reachable on Clearnet and Darknet + + Clearnet Only (IPv4, IPv6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -5937,8 +6263,8 @@ 295,294 - - Reachable on Darknet Only + + Darknet Only (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -5961,25 +6287,29 @@ lightning.share - nodes + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 BTC capacity src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6085,11 +6415,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 @@ -6170,22 +6500,6 @@ 27 - - Top 100 nodes liquidity ranking - - src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 3,7 - - lightning.top-100-liquidity - - - Top 100 nodes connectivity ranking - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 3,7 - - lightning.top-100-connectivity - Oldest nodes diff --git a/frontend/src/locale/messages.it.xlf b/frontend/src/locale/messages.it.xlf index 22d7cf978..427e2deec 100644 --- a/frontend/src/locale/messages.it.xlf +++ b/frontend/src/locale/messages.it.xlf @@ -3203,6 +3203,7 @@ blocks expected + blocchi previsti src/app/components/difficulty/difficulty-tooltip.component.html 13 @@ -3211,6 +3212,7 @@ block expected + blocco previsto src/app/components/difficulty/difficulty-tooltip.component.html 14 @@ -3219,6 +3221,7 @@ blocks mined + blocchi minati src/app/components/difficulty/difficulty-tooltip.component.html 18 @@ -3227,6 +3230,7 @@ block mined + blocco estratto src/app/components/difficulty/difficulty-tooltip.component.html 19 @@ -3235,6 +3239,7 @@ blocks remaining + blocchi rimanenti src/app/components/difficulty/difficulty-tooltip.component.html 24 @@ -3243,6 +3248,7 @@ block remaining + blocco rimanente src/app/components/difficulty/difficulty-tooltip.component.html 25 @@ -3251,6 +3257,7 @@ blocks ahead + blocchi avanti src/app/components/difficulty/difficulty-tooltip.component.html 29 @@ -3259,6 +3266,7 @@ block ahead + blocco avanti src/app/components/difficulty/difficulty-tooltip.component.html 30 @@ -3267,6 +3275,7 @@ blocks behind + blocchi dietro src/app/components/difficulty/difficulty-tooltip.component.html 34 @@ -3275,6 +3284,7 @@ block behind + blocco dietro src/app/components/difficulty/difficulty-tooltip.component.html 35 @@ -3283,6 +3293,7 @@ Average block time + Tempo medio del blocco src/app/components/difficulty/difficulty.component.html 42,45 @@ -3568,6 +3579,7 @@ Lightning Nodes World Map + Mappa Mondiale dei Nodi Lightning src/app/components/graphs/graphs.component.html 41 @@ -3584,6 +3596,7 @@ Lightning Nodes Channels World Map + Mappa Mondiale dei Canali tra Nodi Lightning src/app/components/graphs/graphs.component.html 43 @@ -3704,6 +3717,7 @@ Lightning Explorer + Lightning Explorer src/app/components/master-page/master-page.component.html 44,47 @@ -3924,6 +3938,7 @@ Avg Health + Salute Media src/app/components/pool-ranking/pool-ranking.component.html 96,97 @@ -3980,6 +3995,7 @@ blocks + blocchi src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3999,6 +4015,7 @@ Other () + Altro () src/app/components/pool-ranking/pool-ranking.component.ts 201 @@ -4026,6 +4043,7 @@ mining pool + mining pool src/app/components/pool/pool-preview.component.html 3,5 @@ -4276,6 +4294,7 @@ Avg Block Fees + Commissioni Medie per Blocco src/app/components/reward-stats/reward-stats.component.html 17 @@ -4288,6 +4307,7 @@ Average fees per block in the past 144 blocks + Commissioni medie per blocco negli ultimi 144 blocchi src/app/components/reward-stats/reward-stats.component.html 18,20 @@ -4296,6 +4316,7 @@ BTC/block + BTC/blocco src/app/components/reward-stats/reward-stats.component.html 21,24 @@ -4305,6 +4326,7 @@ Avg Tx Fee + Commissione Tx Media src/app/components/reward-stats/reward-stats.component.html 30 @@ -4349,6 +4371,7 @@ Explore the full Bitcoin ecosystem + Esplora l'intero ecosistema Bitcoin src/app/components/search-form/search-form.component.html 4,5 @@ -4366,6 +4389,7 @@ Bitcoin Block Height + Altezza Blocco Bitcoin src/app/components/search-form/search-results/search-results.component.html 3 @@ -4374,6 +4398,7 @@ Bitcoin Transaction + Transazione Bitcoin src/app/components/search-form/search-results/search-results.component.html 9 @@ -4382,6 +4407,7 @@ Bitcoin Address + Indirizzo Bitcoin src/app/components/search-form/search-results/search-results.component.html 15 @@ -4390,6 +4416,7 @@ Bitcoin Block + Blocco Bitcoin src/app/components/search-form/search-results/search-results.component.html 21 @@ -4398,6 +4425,7 @@ Bitcoin Addresses + Indirizzi Bitcoin src/app/components/search-form/search-results/search-results.component.html 27 @@ -4406,6 +4434,7 @@ Lightning Nodes + Nodi Lightning src/app/components/search-form/search-results/search-results.component.html 35 @@ -4414,6 +4443,7 @@ Lightning Channels + Canali Lightning src/app/components/search-form/search-results/search-results.component.html 43 @@ -4422,6 +4452,7 @@ Go to "" + Vai a &quot;&quot; src/app/components/search-form/search-results/search-results.component.html 52 @@ -4547,6 +4578,7 @@ In ~ + In ~ src/app/components/time/time.component.ts 126 @@ -4676,6 +4708,7 @@ This transaction replaced: + Questa transazione ha sostituito: src/app/components/transaction/transaction.component.html 10,12 @@ -4685,6 +4718,7 @@ Replaced + Sostituito src/app/components/transaction/transaction.component.html 36,39 @@ -4786,6 +4820,7 @@ Flow + Flow src/app/components/transaction/transaction.component.html 202,205 @@ -4799,6 +4834,7 @@ Hide diagram + Nascondi diagramma src/app/components/transaction/transaction.component.html 205,210 @@ -4807,6 +4843,7 @@ Show more + Mostra di più src/app/components/transaction/transaction.component.html 226,228 @@ -4823,6 +4860,7 @@ Show less + Mostra meno src/app/components/transaction/transaction.component.html 228,234 @@ -4835,6 +4873,7 @@ Show diagram + Mostra diagramma src/app/components/transaction/transaction.component.html 248,249 @@ -5019,6 +5058,7 @@ Show more inputs to reveal fee data + Mostra più input per rivelare i dati sulle commissioni src/app/components/transactions-list/transactions-list.component.html 290,293 @@ -5027,6 +5067,7 @@ remaining + rimanente src/app/components/transactions-list/transactions-list.component.html 332,333 @@ -5035,6 +5076,7 @@ other inputs + altri input src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html 12 @@ -5043,6 +5085,7 @@ other outputs + altri output src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html 13 @@ -5051,6 +5094,7 @@ Input + Input src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html 42 @@ -5063,6 +5107,7 @@ Output + Output src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html 43 @@ -5075,6 +5120,7 @@ This transaction saved % on fees by using native SegWit + Questa transazione ha fatto risparmiare il % sulle commissioni utilizzando SegWit nativo src/app/components/tx-features/tx-features.component.html 2 @@ -5101,6 +5147,7 @@ This transaction saved % on fees by using SegWit and could save % more by fully upgrading to native SegWit + Questa transazione ha fatto risparmiare il % sulle commissioni utilizzando SegWit e avrebbe potuto risparmiare il % in più aggiornando completamente a SegWit nativo src/app/components/tx-features/tx-features.component.html 4 @@ -5109,6 +5156,7 @@ This transaction could save % on fees by upgrading to native SegWit or % by upgrading to SegWit-P2SH + Questa transazione avrebbe potuto far risparmiare il % sulle commissioni aggiornando a SegWit nativo o il % aggiornando a SegWit-P2SH src/app/components/tx-features/tx-features.component.html 6 @@ -5117,6 +5165,7 @@ This transaction uses Taproot and thereby saved at least % on fees + Questa transazione utilizza Taproot e quindi ha risparmiato almeno il % sulle commissioni src/app/components/tx-features/tx-features.component.html 12 @@ -5125,6 +5174,7 @@ Taproot + Taproot src/app/components/tx-features/tx-features.component.html 12 @@ -5150,6 +5200,7 @@ This transaction uses Taproot and already saved at least % on fees, but could save an additional % by fully using Taproot + Questa transazione utilizza Taproot e ha già fatto risparmiare almeno il % sulle commissioni, ma poteva far risparmiare un ulteriore % utilizzando completamente Taproot src/app/components/tx-features/tx-features.component.html 14 @@ -5158,6 +5209,7 @@ This transaction could save % on fees by using Taproot + Questa transazione poteva far risparmiare il % sulle commissioni utilizzando Taproot src/app/components/tx-features/tx-features.component.html 16 @@ -5166,6 +5218,7 @@ This transaction does not use Taproot + Questa transazione non utilizza Taproot src/app/components/tx-features/tx-features.component.html 18 @@ -5183,6 +5236,7 @@ This transaction supports Replace-By-Fee (RBF) allowing fee bumping + Questa transazione supporta Replace-By-Fee (RBF) che consente l'aumento delle commissioni src/app/components/tx-features/tx-features.component.html 28 @@ -5308,6 +5362,7 @@ mempool.space merely provides data about the Bitcoin network. It cannot help you with retrieving funds, confirming your transaction quicker, etc. + mempool.space fornisce solo dati sulla rete Bitcoin. Non può aiutarti a recuperare fondi, confermare la tua transazione più velocemente, ecc. src/app/docs/api-docs/api-docs.component.html 13 @@ -5426,6 +5481,7 @@ Base fee + Base fee src/app/lightning/channel/channel-box/channel-box.component.html 29 @@ -5438,6 +5494,7 @@ mSats + mSats src/app/lightning/channel/channel-box/channel-box.component.html 35 @@ -5458,6 +5515,7 @@ This channel supports zero base fee routing + Questo canale supporta lo zero base fee routing src/app/lightning/channel/channel-box/channel-box.component.html 44 @@ -5466,6 +5524,7 @@ Zero base fee + Zero base fee src/app/lightning/channel/channel-box/channel-box.component.html 45 @@ -5474,6 +5533,7 @@ This channel does not support zero base fee routing + Questo canale non supporta lo zero base fee routing src/app/lightning/channel/channel-box/channel-box.component.html 50 @@ -5482,6 +5542,7 @@ Non-zero base fee + Non-zero base fee src/app/lightning/channel/channel-box/channel-box.component.html 51 @@ -5490,6 +5551,7 @@ Min HTLC + Min HTLC src/app/lightning/channel/channel-box/channel-box.component.html 57 @@ -5498,6 +5560,7 @@ Max HTLC + Max HTLC src/app/lightning/channel/channel-box/channel-box.component.html 63 @@ -5506,6 +5569,7 @@ Timelock delta + Timelock delta src/app/lightning/channel/channel-box/channel-box.component.html 69 @@ -5514,6 +5578,7 @@ channels + canali src/app/lightning/channel/channel-box/channel-box.component.html 79 @@ -5530,6 +5595,7 @@ Starting balance + Saldo iniziale src/app/lightning/channel/channel-close-box/channel-close-box.component.html 6 @@ -5539,6 +5605,7 @@ Closing balance + Saldo di chiusura src/app/lightning/channel/channel-close-box/channel-close-box.component.html 12 @@ -5548,6 +5615,7 @@ lightning channel + canale lightning src/app/lightning/channel/channel-preview.component.html 3,5 @@ -5556,6 +5624,7 @@ Inactive + Inattivo src/app/lightning/channel/channel-preview.component.html 10,11 @@ -5572,6 +5641,7 @@ Active + Attivo src/app/lightning/channel/channel-preview.component.html 11,12 @@ -5588,6 +5658,7 @@ Closed + Chiuso src/app/lightning/channel/channel-preview.component.html 12,14 @@ -5608,6 +5679,7 @@ Created + Creato src/app/lightning/channel/channel-preview.component.html 23,26 @@ -5620,6 +5692,7 @@ Capacity + Capacità src/app/lightning/channel/channel-preview.component.html 27,28 @@ -5684,6 +5757,7 @@ ppm + ppm src/app/lightning/channel/channel-preview.component.html 34,35 @@ -5704,6 +5778,7 @@ Lightning channel + Canale Lightning src/app/lightning/channel/channel.component.html 4,7 @@ -5716,6 +5791,7 @@ Last update + Ultimo aggiornamento src/app/lightning/channel/channel.component.html 40,41 @@ -5748,6 +5824,7 @@ Closing date + Data di chiusura src/app/lightning/channel/channel.component.html 44,45 @@ -5760,6 +5837,7 @@ Closed by + Chiuso da src/app/lightning/channel/channel.component.html 59,61 @@ -5768,6 +5846,7 @@ Opening transaction + Transazione di apertura src/app/lightning/channel/channel.component.html 91,92 @@ -5776,6 +5855,7 @@ Closing transaction + Transazione di chiusura src/app/lightning/channel/channel.component.html 100,102 @@ -5784,6 +5864,7 @@ Channel: + Canale: src/app/lightning/channel/channel.component.ts 37 @@ -5791,6 +5872,7 @@ Mutually closed + Chiuso collaborativamente src/app/lightning/channel/closing-type/closing-type.component.ts 20 @@ -5798,6 +5880,7 @@ Force closed + Chiusura forzata src/app/lightning/channel/closing-type/closing-type.component.ts 24 @@ -5805,6 +5888,7 @@ Force closed with penalty + Chiusura forzata con penalità src/app/lightning/channel/closing-type/closing-type.component.ts 28 @@ -5812,6 +5896,7 @@ Open + Aprire src/app/lightning/channels-list/channels-list.component.html 5,7 @@ -5820,6 +5905,7 @@ No channels to display + Nessun canale da visualizzare src/app/lightning/channels-list/channels-list.component.html 29,37 @@ -5828,6 +5914,7 @@ Alias + Alias src/app/lightning/channels-list/channels-list.component.html 38,40 @@ -5864,6 +5951,7 @@ Status + Status src/app/lightning/channels-list/channels-list.component.html 40,41 @@ -5872,6 +5960,7 @@ Channel ID + ID Canale src/app/lightning/channels-list/channels-list.component.html 44,48 @@ -5880,6 +5969,7 @@ sats + sats src/app/lightning/channels-list/channels-list.component.html 63,68 @@ -5932,6 +6022,7 @@ avg + avg src/app/lightning/channels-statistics/channels-statistics.component.html 3,5 @@ -5940,6 +6031,7 @@ med + med src/app/lightning/channels-statistics/channels-statistics.component.html 6,9 @@ -5948,6 +6040,7 @@ Avg Capacity + Capacità Media src/app/lightning/channels-statistics/channels-statistics.component.html 13,15 @@ -5960,6 +6053,7 @@ Avg Fee Rate + Tariffa Media src/app/lightning/channels-statistics/channels-statistics.component.html 26,28 @@ -5972,6 +6066,7 @@ The average fee rate charged by routing nodes, ignoring fee rates > 0.5% or 5000ppm + La tariffa media addebitata dai nodi di routing, ignorando le tariffe > 0,5% o 5000 ppm src/app/lightning/channels-statistics/channels-statistics.component.html 28,30 @@ -5980,6 +6075,7 @@ Avg Base Fee + Commissione Base Media src/app/lightning/channels-statistics/channels-statistics.component.html 41,43 @@ -5992,6 +6088,7 @@ The average base fee charged by routing nodes, ignoring base fees > 5000ppm + La tariffa di base media addebitata dai nodi di routing, ignorando le tariffe di base > 5000 ppm src/app/lightning/channels-statistics/channels-statistics.component.html 43,45 @@ -6000,6 +6097,7 @@ Med Capacity + Capacità Media src/app/lightning/channels-statistics/channels-statistics.component.html 59,61 @@ -6008,6 +6106,7 @@ Med Fee Rate + Tariffa Media src/app/lightning/channels-statistics/channels-statistics.component.html 72,74 @@ -6016,6 +6115,7 @@ The median fee rate charged by routing nodes, ignoring fee rates > 0.5% or 5000ppm + La tariffa mediana addebitata dai nodi di routing, ignorando le tariffe > 0,5% o 5000 ppm src/app/lightning/channels-statistics/channels-statistics.component.html 74,76 @@ -6024,6 +6124,7 @@ Med Base Fee + Tariffa Base Media src/app/lightning/channels-statistics/channels-statistics.component.html 87,89 @@ -6032,6 +6133,7 @@ The median base fee charged by routing nodes, ignoring base fees > 5000ppm + La tariffa di base mediana addebitata dai nodi di routing, ignorando le tariffe di base > 5000 ppm src/app/lightning/channels-statistics/channels-statistics.component.html 89,91 @@ -6040,6 +6142,7 @@ Lightning node group + Gruppo di nodi Lightning src/app/lightning/group/group-preview.component.html 3,5 @@ -6052,6 +6155,7 @@ Nodes + Nodi src/app/lightning/group/group-preview.component.html 25,29 @@ -6088,6 +6192,7 @@ Liquidity + Liquidità src/app/lightning/group/group-preview.component.html 29,31 @@ -6120,6 +6225,7 @@ Channels + Canali src/app/lightning/group/group-preview.component.html 40,43 @@ -6192,6 +6298,7 @@ Average size + Dimensione media src/app/lightning/group/group-preview.component.html 44,46 @@ -6204,6 +6311,7 @@ Location + Posizione src/app/lightning/group/group.component.html 74,77 @@ -6244,6 +6352,7 @@ Network Statistics + Statistiche di Rete src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 10 @@ -6252,6 +6361,7 @@ Channels Statistics + Statistiche dei Canali src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 24 @@ -6260,6 +6370,7 @@ Lightning Network History + Cronologia della Rete Lightning src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 49 @@ -6268,6 +6379,7 @@ Liquidity Ranking + Classifica della Liquidità src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 62 @@ -6292,6 +6404,7 @@ Connectivity Ranking + Classifica Connettività src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 76 @@ -6304,6 +6417,7 @@ Fee distribution + Distribuzione delle commissioni src/app/lightning/node-fee-chart/node-fee-chart.component.html 2 @@ -6312,6 +6426,7 @@ Outgoing Fees + Commissioni in Uscita src/app/lightning/node-fee-chart/node-fee-chart.component.ts 170 @@ -6323,6 +6438,7 @@ Incoming Fees + Commissioni in Entrata src/app/lightning/node-fee-chart/node-fee-chart.component.ts 178 @@ -6334,6 +6450,7 @@ Percentage change past week + Variazione percentuale nell'ultima settimana src/app/lightning/node-statistics/node-statistics.component.html 5,7 @@ -6350,6 +6467,7 @@ Lightning node + Nodo Lightning src/app/lightning/node/node-preview.component.html 3,5 @@ -6366,6 +6484,7 @@ Active capacity + Capacità attiva src/app/lightning/node/node-preview.component.html 20,22 @@ -6378,6 +6497,7 @@ Active channels + Canali attivi src/app/lightning/node/node-preview.component.html 26,30 @@ -6390,6 +6510,7 @@ Country + Paese src/app/lightning/node/node-preview.component.html 44,47 @@ -6398,6 +6519,7 @@ Average channel size + Dimensione media del canale src/app/lightning/node/node.component.html 43,46 @@ -6406,6 +6528,7 @@ Avg channel distance + Distanza media del canale src/app/lightning/node/node.component.html 59,60 @@ -6414,6 +6537,7 @@ Color + Colore src/app/lightning/node/node.component.html 82,84 @@ -6422,6 +6546,7 @@ ISP + ISP src/app/lightning/node/node.component.html 89,90 @@ -6434,6 +6559,7 @@ Exclusively on Tor + Esclusivamente su Tor src/app/lightning/node/node.component.html 96,98 @@ -6442,6 +6568,7 @@ Liquidity ad + Annuncio di liquidità src/app/lightning/node/node.component.html 141,144 @@ -6450,6 +6577,7 @@ Lease fee rate + Tasso di lease src/app/lightning/node/node.component.html 147,150 @@ -6459,6 +6587,7 @@ Lease base fee + Canone base di lease src/app/lightning/node/node.component.html 155,157 @@ -6467,6 +6596,7 @@ Funding weight + Peso del finanziamento src/app/lightning/node/node.component.html 161,162 @@ -6475,6 +6605,7 @@ Channel fee rate + Tariffa del canale src/app/lightning/node/node.component.html 171,174 @@ -6484,6 +6615,7 @@ Channel base fee + Tariffa base del canale src/app/lightning/node/node.component.html 179,181 @@ -6492,6 +6624,7 @@ Compact lease + Lease compatto src/app/lightning/node/node.component.html 191,193 @@ -6500,6 +6633,7 @@ TLV extension records + Record di estensione TLV src/app/lightning/node/node.component.html 202,205 @@ -6508,6 +6642,7 @@ Open channels + Canali aperti src/app/lightning/node/node.component.html 243,246 @@ -6516,6 +6651,7 @@ Closed channels + Canali chiusi src/app/lightning/node/node.component.html 247,250 @@ -6524,6 +6660,7 @@ Node: + Nodo: src/app/lightning/node/node.component.ts 60 @@ -6531,6 +6668,7 @@ (Tor nodes excluded) + (nodi Tor esclusi) src/app/lightning/nodes-channels-map/nodes-channels-map.component.html 8,11 @@ -6551,6 +6689,7 @@ Lightning Nodes Channels World Map + Mappa Mondiale dei Canali tra Nodi Lightning src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts 69 @@ -6558,6 +6697,7 @@ No geolocation data available + Nessun dato di geolocalizzazione disponibile src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts 219,214 @@ -6565,6 +6705,7 @@ Active channels map + Mappa dei canali attivi src/app/lightning/nodes-channels/node-channels.component.html 2,3 @@ -6573,6 +6714,7 @@ Indexing in progress + Indicizzazione in corso src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 121,116 @@ -6584,6 +6726,7 @@ Clearnet and Darknet + Clearnet e Darknet src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -6595,6 +6738,7 @@ Clearnet Only (IPv4, IPv6) + Solo Clearnet (IPv4, IPv6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -6606,6 +6750,7 @@ Darknet Only (Tor, I2P, cjdns) + Solo Darknet (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -6617,6 +6762,7 @@ Share + Condividere src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html 29,31 @@ -6629,6 +6775,7 @@ nodes + nodi src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts 104,103 @@ -6648,6 +6795,7 @@ BTC capacity + Capacità BTC src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts 105,103 @@ -6655,6 +6803,7 @@ Lightning nodes in + Nodi Lightning in src/app/lightning/nodes-per-country/nodes-per-country.component.html 3,4 @@ -6663,6 +6812,7 @@ ISP Count + Conteggio ISP src/app/lightning/nodes-per-country/nodes-per-country.component.html 34,38 @@ -6671,6 +6821,7 @@ Top ISP + Top ISP src/app/lightning/nodes-per-country/nodes-per-country.component.html 38,40 @@ -6679,6 +6830,7 @@ Lightning nodes in + Nodi Lightning in src/app/lightning/nodes-per-country/nodes-per-country.component.ts 35 @@ -6686,6 +6838,7 @@ Clearnet Capacity + Capacità Clearnet src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html 6,8 @@ -6698,6 +6851,7 @@ How much liquidity is running on nodes advertising at least one clearnet IP address + Quanta liquidità è in esecuzione sui nodi che pubblicizzano almeno un indirizzo IP clearnet src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html 8,9 @@ -6706,6 +6860,7 @@ Unknown Capacity + Capacità Sconosciuta src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html 13,15 @@ -6718,6 +6873,7 @@ How much liquidity is running on nodes which ISP was not identifiable + Quanta liquidità è in esecuzione su nodi il cui ISP non era identificabile src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html 15,16 @@ -6726,6 +6882,7 @@ Tor Capacity + Capacità Tor src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html 20,22 @@ -6738,6 +6895,7 @@ How much liquidity is running on nodes advertising only Tor addresses + Quanta liquidità è in esecuzione sui nodi che pubblicizzano solo indirizzi Tor src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html 22,23 @@ -6746,6 +6904,7 @@ Top 100 ISPs hosting LN nodes + Top 100 ISP che ospitano nodi LN src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html 31,33 @@ -6754,6 +6913,7 @@ BTC + BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts 159,157 @@ -6765,6 +6925,7 @@ Lightning ISP + ISP Lightning src/app/lightning/nodes-per-isp/nodes-per-isp-preview.component.html 3,5 @@ -6773,6 +6934,7 @@ Top country + Il miglior paese src/app/lightning/nodes-per-isp/nodes-per-isp-preview.component.html 39,41 @@ -6785,6 +6947,7 @@ Top node + Il miglior nodo src/app/lightning/nodes-per-isp/nodes-per-isp-preview.component.html 45,48 @@ -6793,6 +6956,7 @@ Lightning nodes on ISP: [AS] + Nodi Lightning su ISP: [AS ] src/app/lightning/nodes-per-isp/nodes-per-isp-preview.component.ts 44 @@ -6804,6 +6968,7 @@ Lightning nodes on ISP: + Nodi Lightning sull'ISP: src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 2,4 @@ -6812,6 +6977,7 @@ ASN + ASN src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 11,14 @@ -6820,6 +6986,7 @@ Active nodes + Nodi attivi src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 14,18 @@ -6828,6 +6995,7 @@ Top 100 oldest lightning nodes + I 100 nodi Lightning più vecchi src/app/lightning/nodes-ranking/oldest-nodes/oldest-nodes.component.html 3,7 @@ -6836,6 +7004,7 @@ Oldest lightning nodes + Nodi lightning più vecchi src/app/lightning/nodes-ranking/oldest-nodes/oldest-nodes.component.ts 27 @@ -6843,6 +7012,7 @@ Oldest nodes + Nodi più vecchi src/app/lightning/nodes-rankings-dashboard/nodes-rankings-dashboard.component.html 36 @@ -6851,6 +7021,7 @@ Top lightning nodes + Principali nodi lightning src/app/lightning/nodes-rankings-dashboard/nodes-rankings-dashboard.component.ts 22 @@ -6858,6 +7029,7 @@ Indexing in progress + Indicizzazione in corso src/app/lightning/statistics-chart/lightning-statistics-chart.component.html 52,55 diff --git a/frontend/src/locale/messages.ko.xlf b/frontend/src/locale/messages.ko.xlf index c8ba64090..16f7a29e8 100644 --- a/frontend/src/locale/messages.ko.xlf +++ b/frontend/src/locale/messages.ko.xlf @@ -1475,6 +1475,7 @@ Community Integrations + 커뮤니티 통합 src/app/components/about/about.component.html 181,183 @@ -2134,6 +2135,7 @@ not available + 사용할 수 없음 src/app/components/block-overview-graph/block-overview-graph.component.html 5 @@ -2336,6 +2338,7 @@ Audit status + 감사 상태 src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 36 @@ -2344,6 +2347,7 @@ Match + 일치 src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 38 @@ -2352,6 +2356,7 @@ Removed + 제거됨 src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 39 @@ -2360,6 +2365,7 @@ Marginal fee rate + 한계 수수료율 src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 40 @@ -2372,6 +2378,7 @@ Recently broadcasted + 최근 전파됨 src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 41 @@ -2380,6 +2387,7 @@ Added + 추가됨 src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 42 @@ -2388,6 +2396,7 @@ Block Prediction Accuracy + 블록 예측 정확도 src/app/components/block-prediction-graph/block-prediction-graph.component.html 6,8 @@ -2404,6 +2413,7 @@ No data to display yet. Try again later. + 아직 표시할 데이터가 없습니다. 나중에 다시 시도해주세요. src/app/components/block-prediction-graph/block-prediction-graph.component.ts 108,103 @@ -2419,6 +2429,7 @@ Match rate + 일치율 src/app/components/block-prediction-graph/block-prediction-graph.component.ts 189,187 @@ -2528,6 +2539,7 @@ Size per weight + 무게당 사이즈 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts 200,199 @@ -2642,6 +2654,7 @@ Health + 건강도 src/app/components/block/block.component.html 56 @@ -2658,6 +2671,7 @@ Unknown + 알 수 없음 src/app/components/block/block.component.html 67,70 @@ -2736,6 +2750,7 @@ Subsidy + fees + 보상금 + 수수료 src/app/components/block/block.component.html 153,156 @@ -2749,6 +2764,7 @@ Expected + 예상 src/app/components/block/block.component.html 216 @@ -2757,6 +2773,7 @@ beta + 베타 src/app/components/block/block.component.html 216,217 @@ -2769,6 +2786,7 @@ Actual + 실제 src/app/components/block/block.component.html 218,222 @@ -2860,6 +2878,7 @@ Audit + 감사 src/app/components/block/block.component.html 297,301 @@ -3184,6 +3203,7 @@ blocks expected + 예상한 개 블록 src/app/components/difficulty/difficulty-tooltip.component.html 13 @@ -3192,6 +3212,7 @@ block expected + 예상한 개 블록 src/app/components/difficulty/difficulty-tooltip.component.html 14 @@ -3200,6 +3221,7 @@ blocks mined + 채굴된 개 블록 src/app/components/difficulty/difficulty-tooltip.component.html 18 @@ -3208,6 +3230,7 @@ block mined + 채굴된 개 블록 src/app/components/difficulty/difficulty-tooltip.component.html 19 @@ -3216,6 +3239,7 @@ blocks remaining + 남은 개 블록 src/app/components/difficulty/difficulty-tooltip.component.html 24 @@ -3224,6 +3248,7 @@ block remaining + 남은 개 블록 src/app/components/difficulty/difficulty-tooltip.component.html 25 @@ -3232,6 +3257,7 @@ blocks ahead + 앞서있는 개 블록 src/app/components/difficulty/difficulty-tooltip.component.html 29 @@ -3240,6 +3266,7 @@ block ahead + 앞서있는 개 블록 src/app/components/difficulty/difficulty-tooltip.component.html 30 @@ -3248,6 +3275,7 @@ blocks behind + 뒤처진 개 블록 src/app/components/difficulty/difficulty-tooltip.component.html 34 @@ -3256,6 +3284,7 @@ block behind + 뒤처진 개 블록 src/app/components/difficulty/difficulty-tooltip.component.html 35 @@ -3264,6 +3293,7 @@ Average block time + 평균 블록 생성 시간 src/app/components/difficulty/difficulty.component.html 42,45 @@ -3801,6 +3831,7 @@ Pools luck (1 week) + 채굴 풀들의 운 (1주) src/app/components/pool-ranking/pool-ranking.component.html 9 @@ -3809,6 +3840,7 @@ Pools luck + 채굴 풀들의 운 src/app/components/pool-ranking/pool-ranking.component.html 9,11 @@ -3817,6 +3849,7 @@ The overall luck of all mining pools over the past week. A luck bigger than 100% means the average block time for the current epoch is less than 10 minutes. + 지난 한 주 동안의 모든 채굴 풀의 전반적인 운입니다. 운이 100%보다 크면 현재 에포크의 평균 블록 생성 시간이 10분 미만이라는 뜻입니다. src/app/components/pool-ranking/pool-ranking.component.html 11,15 @@ -3825,6 +3858,7 @@ Pools count (1w) + 채굴 풀 개수 (1주) src/app/components/pool-ranking/pool-ranking.component.html 17 @@ -3833,6 +3867,7 @@ Pools count + 채굴 풀 개수 src/app/components/pool-ranking/pool-ranking.component.html 17,19 @@ -3930,7 +3965,7 @@ Pools Count (1w) - 채굴 풀 개수 + 채굴 풀 개수 (1주) src/app/components/pool-ranking/pool-ranking.component.html 158,160 @@ -4243,6 +4278,7 @@ Avg Block Fees + 평균 블록 수수료 src/app/components/reward-stats/reward-stats.component.html 17 @@ -4272,6 +4308,7 @@ Avg Tx Fee + 평균 거래 수수료 src/app/components/reward-stats/reward-stats.component.html 30 @@ -4316,6 +4353,7 @@ Explore the full Bitcoin ecosystem + 비트코인 생태계 전체를 탐험하세요. src/app/components/search-form/search-form.component.html 4,5 @@ -4760,6 +4798,7 @@ Flow + 흐름 src/app/components/transaction/transaction.component.html 202,205 @@ -4773,6 +4812,7 @@ Hide diagram + 도표 숨기기 src/app/components/transaction/transaction.component.html 205,210 diff --git a/frontend/src/locale/messages.sv.xlf b/frontend/src/locale/messages.sv.xlf index 9d7689760..638a8403d 100644 --- a/frontend/src/locale/messages.sv.xlf +++ b/frontend/src/locale/messages.sv.xlf @@ -3993,9 +3993,9 @@ 58 - - blocks - block + + blocks + block src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -4004,6 +4004,42 @@ src/app/components/pool-ranking/pool-ranking.component.ts 168,167 + + src/app/components/pool-ranking/pool-ranking.component.ts + 203,201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 206,205 + + + + Other () + Övriga () + + src/app/components/pool-ranking/pool-ranking.component.ts + 201 + + + src/app/components/pool-ranking/pool-ranking.component.ts + 205 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 119,114 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 136 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 173,168 + + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 190 + mining pool @@ -5551,6 +5587,10 @@ src/app/lightning/channels-list/channels-list.component.html 123,124 + + src/app/lightning/nodes-map/nodes-map.component.ts + 211,208 + lightning.x-channels @@ -6250,6 +6290,10 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts 194,193 + + src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts + 259,257 + lightning.channels @@ -6730,19 +6774,23 @@ lightning.share - nodes - noder + nodes + noder src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 103,102 + 104,103 + + + src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts + 137,136 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 157,156 + 158,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 189,188 + 191,190 @@ -6750,7 +6798,7 @@ BTC-kapacitet src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts - 104,102 + 105,103 @@ -6868,11 +6916,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 158,156 + 159,157 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 190,188 + 192,190 diff --git a/frontend/src/locale/messages.th.xlf b/frontend/src/locale/messages.th.xlf index a0adc00e4..8f423ffa8 100644 --- a/frontend/src/locale/messages.th.xlf +++ b/frontend/src/locale/messages.th.xlf @@ -1475,6 +1475,7 @@ Community Integrations + การร่วมมือกับคอมมูนิตี้ src/app/components/about/about.component.html 181,183 @@ -2134,6 +2135,7 @@ not available + ไม่สามารถใช้ได้ src/app/components/block-overview-graph/block-overview-graph.component.html 5 @@ -2336,6 +2338,7 @@ Audit status + สถานะการตรวจสอบ src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 36 @@ -2344,6 +2347,7 @@ Match + ตรงกัน src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 38 @@ -2352,6 +2356,7 @@ Removed + ถูกลบ src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 39 @@ -2360,6 +2365,7 @@ Marginal fee rate + อัตราค่าธรรมเนียมเพิ่มเติม src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 40 @@ -2372,6 +2378,7 @@ Recently broadcasted + ที่ประกาศไปล่าสุด src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 41 @@ -2380,6 +2387,7 @@ Added + ถูกเพิ่ม src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 42 @@ -2388,6 +2396,7 @@ Block Prediction Accuracy + ความแม่นยำในการทำนายบล็อก src/app/components/block-prediction-graph/block-prediction-graph.component.html 6,8 @@ -2404,6 +2413,7 @@ No data to display yet. Try again later. + ไม่มีข้อมูลที่จะแสดง โปรดลองอีกครั้งในภายหลัง src/app/components/block-prediction-graph/block-prediction-graph.component.ts 108,103 @@ -2419,6 +2429,7 @@ Match rate + เรทตรงกัน src/app/components/block-prediction-graph/block-prediction-graph.component.ts 189,187 @@ -2528,6 +2539,7 @@ Size per weight + ขนาดต่อน้ำหนัก src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts 200,199 @@ -2539,6 +2551,7 @@ Block + บล็อก src/app/components/block/block-preview.component.html 3,7 @@ -2641,6 +2654,7 @@ Health + สถานะ src/app/components/block/block.component.html 56 @@ -2657,6 +2671,7 @@ Unknown + ไม่ทราบ src/app/components/block/block.component.html 67,70 @@ -2735,6 +2750,7 @@ Subsidy + fees + เงินอุดหนุน + ค่าธรรมเนียม src/app/components/block/block.component.html 153,156 @@ -2748,6 +2764,7 @@ Expected + ที่คาดหวัง src/app/components/block/block.component.html 216 @@ -2756,6 +2773,7 @@ beta + เบต้า src/app/components/block/block.component.html 216,217 @@ -2768,6 +2786,7 @@ Actual + ความจริง src/app/components/block/block.component.html 218,222 @@ -2776,6 +2795,7 @@ Expected Block + บล็อกที่คาดหวัง src/app/components/block/block.component.html 222 @@ -2784,6 +2804,7 @@ Actual Block + บล็อกจริง src/app/components/block/block.component.html 231 @@ -2857,6 +2878,7 @@ Audit + การตรวจสอบ src/app/components/block/block.component.html 297,301 @@ -3260,6 +3282,7 @@ Average block time + เวลาบล็อกโดยเฉลี่ย src/app/components/difficulty/difficulty.component.html 42,45 @@ -3489,6 +3512,7 @@ Lightning Network Capacity + ความจุเน็ตเวิร์ค Lightning src/app/components/graphs/graphs.component.html 35 @@ -3509,6 +3533,7 @@ Lightning Nodes Per ISP + จำนวนโหนด Lightning ต่อ ISP src/app/components/graphs/graphs.component.html 37 @@ -3521,6 +3546,7 @@ Lightning Nodes Per Country + จำนวนโหนด Lightning ต่อประเทศ src/app/components/graphs/graphs.component.html 39 @@ -3537,6 +3563,7 @@ Lightning Nodes World Map + แผนที่โหนด Ligntning src/app/components/graphs/graphs.component.html 41 @@ -6533,6 +6560,7 @@ Indexing in progress + กำลังทำการจัดเรียงข้อมูล src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 121,116 @@ -6544,6 +6572,7 @@ Clearnet and Darknet + Clearnet และ Darknet src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -6555,6 +6584,7 @@ Clearnet Only (IPv4, IPv6) + Clearnet เท่านั้น (IPv4, IPv6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -6566,6 +6596,7 @@ Darknet Only (Tor, I2P, cjdns) + Darknet เท่านั้น (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -6577,6 +6608,7 @@ Share + แชร์ src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html 29,31 @@ -6608,6 +6640,7 @@ BTC capacity + ความจุ BTC src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts 105,103 @@ -6615,6 +6648,7 @@ Lightning nodes in + โหนด lightning ใน src/app/lightning/nodes-per-country/nodes-per-country.component.html 3,4 @@ -6623,6 +6657,7 @@ ISP Count + จำนวน ISP src/app/lightning/nodes-per-country/nodes-per-country.component.html 34,38 @@ -6631,6 +6666,7 @@ Top ISP + ISP ชั้นนำ src/app/lightning/nodes-per-country/nodes-per-country.component.html 38,40 @@ -6646,6 +6682,7 @@ Clearnet Capacity + ความจุ clearnet src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html 6,8 @@ -6666,6 +6703,7 @@ Unknown Capacity + ไม่ทราบความจุ src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html 13,15 @@ -6686,6 +6724,7 @@ Tor Capacity + ความจุของ Tor src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html 20,22 @@ -6714,6 +6753,7 @@ BTC + BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts 159,157 @@ -6725,6 +6765,7 @@ Lightning ISP + Lightning ISP src/app/lightning/nodes-per-isp/nodes-per-isp-preview.component.html 3,5 @@ -6772,6 +6813,7 @@ ASN + ASN src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 11,14 @@ -6780,6 +6822,7 @@ Active nodes + โหนดที่ใช้งานอยู่ src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 14,18 @@ -6803,6 +6846,7 @@ Oldest nodes + โหนดที่เก่าที่สุด src/app/lightning/nodes-rankings-dashboard/nodes-rankings-dashboard.component.html 36 @@ -6818,6 +6862,7 @@ Indexing in progress + กำลังทำการจัดเรียงข้อมูล src/app/lightning/statistics-chart/lightning-statistics-chart.component.html 52,55 diff --git a/frontend/src/locale/messages.uk.xlf b/frontend/src/locale/messages.uk.xlf index 5794afcc5..e24676d08 100644 --- a/frontend/src/locale/messages.uk.xlf +++ b/frontend/src/locale/messages.uk.xlf @@ -3194,7 +3194,7 @@ Next Halving - Наступне зменшення винагороди + Наступний халвінг src/app/components/difficulty-mining/difficulty-mining.component.html 50,52 @@ -3203,6 +3203,7 @@ blocks expected + блоків очікується src/app/components/difficulty/difficulty-tooltip.component.html 13 @@ -3211,6 +3212,7 @@ block expected + блок очікується src/app/components/difficulty/difficulty-tooltip.component.html 14 @@ -3219,6 +3221,7 @@ blocks mined + блоків знайдено src/app/components/difficulty/difficulty-tooltip.component.html 18 @@ -3227,6 +3230,7 @@ block mined + блок знайдено src/app/components/difficulty/difficulty-tooltip.component.html 19 @@ -3235,6 +3239,7 @@ blocks remaining + блоків лишається src/app/components/difficulty/difficulty-tooltip.component.html 24 @@ -3243,6 +3248,7 @@ block remaining + блок лишається src/app/components/difficulty/difficulty-tooltip.component.html 25 @@ -3251,6 +3257,7 @@ blocks ahead + блоків попереду src/app/components/difficulty/difficulty-tooltip.component.html 29 @@ -3259,6 +3266,7 @@ block ahead + блок попереду src/app/components/difficulty/difficulty-tooltip.component.html 30 @@ -3267,6 +3275,7 @@ blocks behind + блоків позаду src/app/components/difficulty/difficulty-tooltip.component.html 34 @@ -3275,6 +3284,7 @@ block behind + блок позаду src/app/components/difficulty/difficulty-tooltip.component.html 35 @@ -3283,6 +3293,7 @@ Average block time + Середній час блоків src/app/components/difficulty/difficulty.component.html 42,45 @@ -3517,7 +3528,7 @@ Lightning Network Capacity - Пропускна спроможність Lightning + Місткість Lightning src/app/components/graphs/graphs.component.html 35 @@ -3984,6 +3995,7 @@ blocks + блоків src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -4003,6 +4015,7 @@ Other () + Інші () src/app/components/pool-ranking/pool-ranking.component.ts 201 @@ -4565,6 +4578,7 @@ In ~ + Через ~ src/app/components/time/time.component.ts 126 @@ -5678,7 +5692,7 @@ Capacity - Пропускна спроможність + Місткість src/app/lightning/channel/channel-preview.component.html 27,28 @@ -6026,7 +6040,7 @@ Avg Capacity - Середня пропускна спроможність + Середня місткість src/app/lightning/channels-statistics/channels-statistics.component.html 13,15 @@ -6039,7 +6053,7 @@ Avg Fee Rate - Середня ставка комісії + Середній тариф src/app/lightning/channels-statistics/channels-statistics.component.html 26,28 @@ -6052,7 +6066,7 @@ The average fee rate charged by routing nodes, ignoring fee rates > 0.5% or 5000ppm - Середня ставка комісії, що стягується нодами маршрутизації, без урахування ставок комісії > 0.5% або 5000ppm + Середній тариф, що стягується нодами маршрутизації, без урахування ставок комісії > 0.5% або 5000ppm src/app/lightning/channels-statistics/channels-statistics.component.html 28,30 @@ -6061,7 +6075,7 @@ Avg Base Fee - Середня базова комісія + Середня комісія src/app/lightning/channels-statistics/channels-statistics.component.html 41,43 @@ -6074,7 +6088,7 @@ The average base fee charged by routing nodes, ignoring base fees > 5000ppm - Середня базова комісія, що стягується нодами маршрутизації, без урахування базової комісії > 5000ppm + Середня комісія, що стягується нодами маршрутизації, без урахування комісії > 5000ppm src/app/lightning/channels-statistics/channels-statistics.component.html 43,45 @@ -6470,7 +6484,7 @@ Active capacity - Активна пропускна спроможність + Активна місткість src/app/lightning/node/node-preview.component.html 20,22 @@ -6712,6 +6726,7 @@ Clearnet and Darknet + Клірнет та Даркнет src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -6723,6 +6738,7 @@ Clearnet Only (IPv4, IPv6) + Тільки Клірнет (IPv4, IPv6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -6734,6 +6750,7 @@ Darknet Only (Tor, I2P, cjdns) + Тільки Даркнет (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -6758,6 +6775,7 @@ nodes + нод src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts 104,103 @@ -6820,7 +6838,7 @@ Clearnet Capacity - Пропускна спроможність Клірнету + Місткість Клірнету src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html 6,8 @@ -6842,7 +6860,7 @@ Unknown Capacity - Пропускна спроможність невідома + Місткість невідома src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html 13,15 @@ -6864,7 +6882,7 @@ Tor Capacity - Пропускна спроможність Tor + Місткість Tor src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html 20,22 diff --git a/frontend/src/locale/messages.zh.xlf b/frontend/src/locale/messages.zh.xlf index d2ec0f162..eddfdf5d7 100644 --- a/frontend/src/locale/messages.zh.xlf +++ b/frontend/src/locale/messages.zh.xlf @@ -11,6 +11,7 @@ Slide of + Slide of node_modules/src/carousel/carousel.ts 175,181 @@ -4544,6 +4545,7 @@ In ~ + 之内 src/app/components/time/time.component.ts 126 From eefe343973e04fce70daa1799e3ff935a40ec9b0 Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Thu, 16 Mar 2023 09:54:12 -0400 Subject: [PATCH 29/60] Add faqs on mempool size and memory usage --- frontend/src/app/docs/api-docs/api-docs-data.ts | 14 ++++++++++++++ .../src/app/docs/api-docs/api-docs.component.html | 12 ++++++++++++ 2 files changed, 26 insertions(+) diff --git a/frontend/src/app/docs/api-docs/api-docs-data.ts b/frontend/src/app/docs/api-docs/api-docs-data.ts index 62d031613..decde2845 100644 --- a/frontend/src/app/docs/api-docs/api-docs-data.ts +++ b/frontend/src/app/docs/api-docs/api-docs-data.ts @@ -8859,6 +8859,20 @@ export const faqData = [ fragment: "what-is-full-mempool", title: "What does it mean for the mempool to be \"full\"?", }, + { + type: "endpoint", + category: "advanced", + showConditions: bitcoinNetworks, + fragment: "how-big-is-mempool.space-mempool", + title: "How big is the mempool.space mempool?", + }, + { + type: "endpoint", + category: "advanced", + showConditions: bitcoinNetworks, + fragment: "what-is-memory-usage", + title: "What is memory usage?", + }, { type: "endpoint", category: "advanced", diff --git a/frontend/src/app/docs/api-docs/api-docs.component.html b/frontend/src/app/docs/api-docs/api-docs.component.html index f5bf519bf..b45279bc3 100644 --- a/frontend/src/app/docs/api-docs/api-docs.component.html +++ b/frontend/src/app/docs/api-docs/api-docs.component.html @@ -207,6 +207,18 @@

When a Bitcoin transaction is made, it is stored in a Bitcoin node's mempool before it is confirmed into a block. When the rate of incoming transactions exceeds the rate transactions are confirmed, the mempool grows in size.

By default, Bitcoin Core allocates 300MB of memory for its mempool, so when a node's mempool grows big enough to use all 300MB of allocated memory, we say it's "full".

Once a node's mempool is using all of its allocated memory, it will start rejecting new transactions below a certain feerate threshold—so when this is the case, be extra sure to set a feerate that (at a minimum) exceeds that threshold. The current threshold feerate (and memory usage) are displayed right on Mempool's front page.

+ +

mempool.space uses 2 Bitcoin nodes to obtain data: one with a standard 300MB memory allocation for its mempool (call this Node A), and another with a much larger memory allocation for its mempool (call this Node B).

+

Most nodes on the Bitcoin network are configured to run like Node A. When all 300MB of memory are used up, the node will start rejecting transactions below a certain feerate from entering its mempool. Running a standard node allows mempool.space to tell you what this feerate is, so you can use a feerate that is high enough to get your transaction widely propagated (i.e. accepted into as many nodes' mempools as possible).

+

Node B's mempool is so big that it doesn't ever fill up, so it never rejects transactions. This allows for mempool.space to provide you with information on any pending transaction it has received—no matter how congested the mempool is, and no matter how deep in the queue the transaction is.

+ + + +

Memory usage on the front page indicates the amount of system memory used by a Bitcoin node's mempool at a particular moment in time. The amount of memory used by a node's mempool is always more than the total size of all pending transactions in its mempool due to indexes, pointers, and other overhead for storage and processing.

+

When mempools fill up, you may notice memory usage on mempool.space go beyond 300MB. This is because, as explained above, mempool.space runs a node with a very high mempool memory allocation—so it never rejects (or evicts) transactions. If memory usage shows 600MB, for example, this just means that a node that stores all the transactions it receives will use about 600MB of memory for its mempool at that moment in time. It's another data point to give you an idea of how congested the network is.

+

A Bitcoin node running the default 300MB setting for mempool memory allocation, like most Raspberry Pi nodes, will never go past 300MB of memory usage.

+ +

When a new block is found, mining pools send miners a block template with no transactions so they can start searching for the next block as soon as possible. They send a block template full of transactions right afterward, but a full block template is a bigger data transfer and takes slightly longer to reach miners.

In this intervening time, which is usually no more than 1-2 seconds, miners sometimes get lucky and find a new block using the empty block template.

 From 377f71eb52f795c37f4158453623eb28f5e4449a Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Fri, 17 Mar 2023 08:01:15 -0400 Subject: [PATCH 30/60] Integrate feedback to memory usage faqs --- frontend/src/app/docs/api-docs/api-docs-data.ts | 4 ++-- .../src/app/docs/api-docs/api-docs.component.html | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/src/app/docs/api-docs/api-docs-data.ts b/frontend/src/app/docs/api-docs/api-docs-data.ts index decde2845..04cd65d4e 100644 --- a/frontend/src/app/docs/api-docs/api-docs-data.ts +++ b/frontend/src/app/docs/api-docs/api-docs-data.ts @@ -8863,8 +8863,8 @@ export const faqData = [ type: "endpoint", category: "advanced", showConditions: bitcoinNetworks, - fragment: "how-big-is-mempool.space-mempool", - title: "How big is the mempool.space mempool?", + fragment: "how-big-is-mempool-used-by-mempool.space", + title: "How big is the mempool used by mempool.space?", }, { type: "endpoint", diff --git a/frontend/src/app/docs/api-docs/api-docs.component.html b/frontend/src/app/docs/api-docs/api-docs.component.html index b45279bc3..68c022afe 100644 --- a/frontend/src/app/docs/api-docs/api-docs.component.html +++ b/frontend/src/app/docs/api-docs/api-docs.component.html @@ -207,16 +207,16 @@

When a Bitcoin transaction is made, it is stored in a Bitcoin node's mempool before it is confirmed into a block. When the rate of incoming transactions exceeds the rate transactions are confirmed, the mempool grows in size.

By default, Bitcoin Core allocates 300MB of memory for its mempool, so when a node's mempool grows big enough to use all 300MB of allocated memory, we say it's "full".

Once a node's mempool is using all of its allocated memory, it will start rejecting new transactions below a certain feerate threshold—so when this is the case, be extra sure to set a feerate that (at a minimum) exceeds that threshold. The current threshold feerate (and memory usage) are displayed right on Mempool's front page.

- -

mempool.space uses 2 Bitcoin nodes to obtain data: one with a standard 300MB memory allocation for its mempool (call this Node A), and another with a much larger memory allocation for its mempool (call this Node B).

-

Most nodes on the Bitcoin network are configured to run like Node A. When all 300MB of memory are used up, the node will start rejecting transactions below a certain feerate from entering its mempool. Running a standard node allows mempool.space to tell you what this feerate is, so you can use a feerate that is high enough to get your transaction widely propagated (i.e. accepted into as many nodes' mempools as possible).

-

Node B's mempool is so big that it doesn't ever fill up, so it never rejects transactions. This allows for mempool.space to provide you with information on any pending transaction it has received—no matter how congested the mempool is, and no matter how deep in the queue the transaction is.

+ +

mempool.space uses multiple Bitcoin nodes to obtain data: some with the default 300MB mempool memory limit (call these Small Nodes) and others with a much larger mempool memory limit (call these Big Nodes).

+

Many nodes on the Bitcoin network are configured to run with the default 300MB mempool memory setting. When all 300MB of memory are used up, such nodes will reject transactions below a certain threshold feerate. Running Small Nodes allows mempool.space to tell you what this threshold feerate is—this is the "Purging" feerate that shows on the front page when mempools are full, which you can use to be reasonably sure that your transaction will be widely propagated.

+

Big Node mempools are so big that they don't need to reject (or purge) transactions. Such nodes allow for mempool.space to provide you with information on any pending transaction it has received—no matter how congested the mempool is, and no matter how low-feerate or low-priority the transaction is.

 -

Memory usage on the front page indicates the amount of system memory used by a Bitcoin node's mempool at a particular moment in time. The amount of memory used by a node's mempool is always more than the total size of all pending transactions in its mempool due to indexes, pointers, and other overhead for storage and processing.

-

When mempools fill up, you may notice memory usage on mempool.space go beyond 300MB. This is because, as explained above, mempool.space runs a node with a very high mempool memory allocation—so it never rejects (or evicts) transactions. If memory usage shows 600MB, for example, this just means that a node that stores all the transactions it receives will use about 600MB of memory for its mempool at that moment in time. It's another data point to give you an idea of how congested the network is.

-

A Bitcoin node running the default 300MB setting for mempool memory allocation, like most Raspberry Pi nodes, will never go past 300MB of memory usage.

+

Memory usage on the front page refers to the real-time amount of system memory used by a Bitcoin node's mempool. This memory usage number is always higher than the total size of all pending transactions in the mempool due to indexes, pointers, and other overhead used by Bitcoin Core for storage and processing.

+

mempool.space shows memory usage of a node that has a very high mempool memory limit (more on this above). As a result, when mempools fill up, you may notice memory usage on mempool.space go beyond 300MB. This is not a mistake—this memory usage figure is high because it's for Bitcoin node that isn't rejecting (or evicting) transactions. Consider it to be another data point to give you an idea of how congested the mempool is relative to the default memory limit of 300MB.

+

A Bitcoin node running the default 300MB mempool memory limit, like most Raspberry Pi nodes, will never go past 300MB of memory usage.

 From b0a0ad11b471a2bbd7e48ed15eaf873c7334424c Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Fri, 17 Mar 2023 08:24:37 -0400 Subject: [PATCH 31/60] Show mempool.space memory usage faq on official --- frontend/src/app/docs/api-docs/api-docs-data.ts | 1 + frontend/src/app/docs/api-docs/api-docs-nav.component.html | 2 +- frontend/src/app/docs/api-docs/api-docs-nav.component.ts | 2 ++ frontend/src/app/docs/api-docs/api-docs.component.html | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/docs/api-docs/api-docs-data.ts b/frontend/src/app/docs/api-docs/api-docs-data.ts index 04cd65d4e..e6ed38a77 100644 --- a/frontend/src/app/docs/api-docs/api-docs-data.ts +++ b/frontend/src/app/docs/api-docs/api-docs-data.ts @@ -8865,6 +8865,7 @@ export const faqData = [ showConditions: bitcoinNetworks, fragment: "how-big-is-mempool-used-by-mempool.space", title: "How big is the mempool used by mempool.space?", + options: { officialOnly: true }, }, { type: "endpoint", diff --git a/frontend/src/app/docs/api-docs/api-docs-nav.component.html b/frontend/src/app/docs/api-docs/api-docs-nav.component.html index 0353d5fb0..ec1cde38f 100644 --- a/frontend/src/app/docs/api-docs/api-docs-nav.component.html +++ b/frontend/src/app/docs/api-docs/api-docs-nav.component.html @@ -1,4 +1,4 @@

{{ item.title }}

- {{ item.title }} + {{ item.title }}
diff --git a/frontend/src/app/docs/api-docs/api-docs-nav.component.ts b/frontend/src/app/docs/api-docs/api-docs-nav.component.ts index 439f20339..6e804de46 100644 --- a/frontend/src/app/docs/api-docs/api-docs-nav.component.ts +++ b/frontend/src/app/docs/api-docs/api-docs-nav.component.ts @@ -16,6 +16,7 @@ export class ApiDocsNavComponent implements OnInit { env: Env; tabData: any[]; auditEnabled: boolean; + officialMempoolInstance: boolean; constructor( private stateService: StateService @@ -23,6 +24,7 @@ export class ApiDocsNavComponent implements OnInit { ngOnInit(): void { this.env = this.stateService.env; + this.officialMempoolInstance = this.env.OFFICIAL_MEMPOOL_SPACE; this.auditEnabled = this.env.AUDIT; if (this.whichTab === 'rest') { this.tabData = restApiDocsData; diff --git a/frontend/src/app/docs/api-docs/api-docs.component.html b/frontend/src/app/docs/api-docs/api-docs.component.html index 68c022afe..8d274625a 100644 --- a/frontend/src/app/docs/api-docs/api-docs.component.html +++ b/frontend/src/app/docs/api-docs/api-docs.component.html @@ -16,7 +16,7 @@
-
+

{{ item.title }}

24h1wAllBlocks 24h1wAll
+
+
+
{{ item.title }}{{ item.category }}
@@ -215,7 +215,7 @@

Memory usage on the front page refers to the real-time amount of system memory used by a Bitcoin node's mempool. This memory usage number is always higher than the total size of all pending transactions in the mempool due to indexes, pointers, and other overhead used by Bitcoin Core for storage and processing.

-

mempool.space shows memory usage of a node that has a very high mempool memory limit (more on this above). As a result, when mempools fill up, you may notice memory usage on mempool.space go beyond 300MB. This is not a mistake—this memory usage figure is high because it's for Bitcoin node that isn't rejecting (or evicting) transactions. Consider it to be another data point to give you an idea of how congested the mempool is relative to the default memory limit of 300MB.

+

mempool.space shows the memory usage of a Bitcoin node that has a very high mempool memory limit. As a result, when mempools fill up, you may notice memory usage on mempool.space go beyond 300MB. This is not a mistake—this memory usage figure is high because it's for a Bitcoin node that isn't rejecting (or evicting) transactions. Consider it to be another data point to give you an idea of how congested the mempool is relative to the default memory limit of 300MB.

A Bitcoin node running the default 300MB mempool memory limit, like most Raspberry Pi nodes, will never go past 300MB of memory usage.

 From 7c2493f3fa5f359c2dd06014305199175d8e1660 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 17 Mar 2023 22:07:48 +0900 Subject: [PATCH 32/60] ops: Bump elementsd to v22.1 --- production/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/install b/production/install index fb47629d4..548dc6be7 100755 --- a/production/install +++ b/production/install @@ -357,7 +357,7 @@ ELEMENTS_REPO_URL=https://github.com/ElementsProject/elements ELEMENTS_REPO_NAME=elements ELEMENTS_REPO_BRANCH=master #ELEMENTS_LATEST_RELEASE=$(curl -s https://api.github.com/repos/ElementsProject/elements/releases/latest|grep tag_name|head -1|cut -d '"' -f4) -ELEMENTS_LATEST_RELEASE=elements-0.21.0.2 +ELEMENTS_LATEST_RELEASE=elements-22.1 echo -n '.' BITCOIN_ELECTRS_REPO_URL=https://github.com/blockstream/electrs From ec8a46ede6792437178a9bbcdf4a52405262fbb5 Mon Sep 17 00:00:00 2001 From: softsimon Date: Sat, 18 Mar 2023 15:33:57 +0900 Subject: [PATCH 33/60] Pulling from transifex --- frontend/src/locale/messages.fr.xlf | 40 +++++++++--------- frontend/src/locale/messages.it.xlf | 60 +++++++++++++-------------- frontend/src/locale/messages.mk.xlf | 3 +- frontend/src/locale/messages.zh.xlf | 63 +++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+), 51 deletions(-) diff --git a/frontend/src/locale/messages.fr.xlf b/frontend/src/locale/messages.fr.xlf index 9bf9db7c0..4322b5be3 100644 --- a/frontend/src/locale/messages.fr.xlf +++ b/frontend/src/locale/messages.fr.xlf @@ -487,7 +487,7 @@ Block : - Bloc : + Bloc : src/app/bisq/bisq-block/bisq-block.component.ts 89 @@ -842,7 +842,7 @@ Amount () - Montant ( ) + Montant () src/app/bisq/bisq-market/bisq-market.component.html 112,113 @@ -1109,7 +1109,7 @@ confirmation - confirmation + confirmation src/app/bisq/bisq-transaction/bisq-transaction.component.html 20,21 @@ -1131,7 +1131,7 @@ confirmations - confirmations + confirmations src/app/bisq/bisq-transaction/bisq-transaction.component.html 21,22 @@ -1234,7 +1234,7 @@ Transaction: - Transaction : + Transaction: src/app/bisq/bisq-transaction/bisq-transaction.component.ts 50 @@ -1611,7 +1611,7 @@ Address: - Adresse : + Adresse: src/app/components/address/address-preview.component.ts 70 @@ -1800,7 +1800,7 @@ Asset: - Actif : + Actif: src/app/components/asset/asset.component.ts 75 @@ -3203,7 +3203,7 @@ blocks expected - blocs attendus + blocs attendus src/app/components/difficulty/difficulty-tooltip.component.html 13 @@ -3221,7 +3221,7 @@ blocks mined - blocs trouvés + blocs trouvés src/app/components/difficulty/difficulty-tooltip.component.html 18 @@ -3230,7 +3230,7 @@ block mined - bloc trouvé + bloc trouvé src/app/components/difficulty/difficulty-tooltip.component.html 19 @@ -3239,7 +3239,7 @@ blocks remaining - blocs restants + blocs restants src/app/components/difficulty/difficulty-tooltip.component.html 24 @@ -3248,7 +3248,7 @@ block remaining - bloc restant + bloc restant src/app/components/difficulty/difficulty-tooltip.component.html 25 @@ -3257,7 +3257,7 @@ blocks ahead - blocs d'avance + blocs d'avance src/app/components/difficulty/difficulty-tooltip.component.html 29 @@ -3266,7 +3266,7 @@ block ahead - bloc d'avance + bloc d'avance src/app/components/difficulty/difficulty-tooltip.component.html 30 @@ -3275,7 +3275,7 @@ blocks behind - blocs de retard + blocs de retard src/app/components/difficulty/difficulty-tooltip.component.html 34 @@ -3284,7 +3284,7 @@ block behind - bloc de retard + bloc de retard src/app/components/difficulty/difficulty-tooltip.component.html 35 @@ -4578,7 +4578,7 @@ In ~ - Dans ~ + Dans ~ src/app/components/time/time.component.ts 126 @@ -5200,7 +5200,7 @@ This transaction uses Taproot and already saved at least % on fees, but could save an additional % by fully using Taproot - Cette transaction utilise Taproot et a déjà économisé au moins  % sur les frais, mais pourrait économiser  % supplémentaires en utilisant pleinement Taproot + Cette transaction utilise Taproot et a déjà économisé au moins % sur les frais, mais pourrait économiser % supplémentaires en utilisant pleinement Taproot src/app/components/tx-features/tx-features.component.html 14 @@ -5578,7 +5578,7 @@ channels - canaux + canaux src/app/lightning/channel/channel-box/channel-box.component.html 79 @@ -5864,7 +5864,7 @@ Channel: - Canal : + Canal: src/app/lightning/channel/channel.component.ts 37 diff --git a/frontend/src/locale/messages.it.xlf b/frontend/src/locale/messages.it.xlf index 427e2deec..6f683398b 100644 --- a/frontend/src/locale/messages.it.xlf +++ b/frontend/src/locale/messages.it.xlf @@ -3203,7 +3203,7 @@ blocks expected - blocchi previsti + blocchi previsti src/app/components/difficulty/difficulty-tooltip.component.html 13 @@ -3221,7 +3221,7 @@ blocks mined - blocchi minati + blocchi minati src/app/components/difficulty/difficulty-tooltip.component.html 18 @@ -3230,7 +3230,7 @@ block mined - blocco estratto + blocco estratto src/app/components/difficulty/difficulty-tooltip.component.html 19 @@ -3239,7 +3239,7 @@ blocks remaining - blocchi rimanenti + blocchi rimanenti src/app/components/difficulty/difficulty-tooltip.component.html 24 @@ -3248,7 +3248,7 @@ block remaining - blocco rimanente + blocco rimanente src/app/components/difficulty/difficulty-tooltip.component.html 25 @@ -3257,7 +3257,7 @@ blocks ahead - blocchi avanti + blocchi avanti src/app/components/difficulty/difficulty-tooltip.component.html 29 @@ -3266,7 +3266,7 @@ block ahead - blocco avanti + blocco avanti src/app/components/difficulty/difficulty-tooltip.component.html 30 @@ -3275,7 +3275,7 @@ blocks behind - blocchi dietro + blocchi dietro src/app/components/difficulty/difficulty-tooltip.component.html 34 @@ -3284,7 +3284,7 @@ block behind - blocco dietro + blocco dietro src/app/components/difficulty/difficulty-tooltip.component.html 35 @@ -3995,7 +3995,7 @@ blocks - blocchi + blocchi src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -4518,7 +4518,7 @@ ago - fa + fa src/app/components/time/time.component.ts 103 @@ -5067,7 +5067,7 @@ remaining - rimanente + rimanente src/app/components/transactions-list/transactions-list.component.html 332,333 @@ -5578,7 +5578,7 @@ channels - canali + canali src/app/lightning/channel/channel-box/channel-box.component.html 79 @@ -6775,7 +6775,7 @@ nodes - nodi + nodi src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts 104,103 @@ -6795,7 +6795,7 @@ BTC capacity - Capacità BTC + Capacità BTC src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts 105,103 @@ -6913,7 +6913,7 @@ BTC - BTC + BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts 159,157 @@ -7038,7 +7038,7 @@ year - anno + anno src/app/shared/i18n/dates.ts 3 @@ -7046,7 +7046,7 @@ years - anni + anni src/app/shared/i18n/dates.ts 4 @@ -7054,7 +7054,7 @@ month - mese + mese src/app/shared/i18n/dates.ts 5 @@ -7062,7 +7062,7 @@ months - mesi + mesi src/app/shared/i18n/dates.ts 6 @@ -7070,7 +7070,7 @@ week - settimana + settimana src/app/shared/i18n/dates.ts 7 @@ -7078,7 +7078,7 @@ weeks - settimane + settimane src/app/shared/i18n/dates.ts 8 @@ -7086,7 +7086,7 @@ day - giorno + giorno src/app/shared/i18n/dates.ts 9 @@ -7094,7 +7094,7 @@ days - giorni + giorni src/app/shared/i18n/dates.ts 10 @@ -7102,7 +7102,7 @@ hour - ora + ora src/app/shared/i18n/dates.ts 11 @@ -7110,7 +7110,7 @@ hours - ore + ore src/app/shared/i18n/dates.ts 12 @@ -7118,7 +7118,7 @@ minute - minuto + minuto src/app/shared/i18n/dates.ts 13 @@ -7126,7 +7126,7 @@ minutes - minuti + minuti src/app/shared/i18n/dates.ts 14 @@ -7134,7 +7134,7 @@ second - secondo + secondo src/app/shared/i18n/dates.ts 15 @@ -7142,7 +7142,7 @@ seconds - secondi + secondi src/app/shared/i18n/dates.ts 16 diff --git a/frontend/src/locale/messages.mk.xlf b/frontend/src/locale/messages.mk.xlf index 9b2cbd58f..848cdf8d7 100644 --- a/frontend/src/locale/messages.mk.xlf +++ b/frontend/src/locale/messages.mk.xlf @@ -148,7 +148,7 @@ - + node_modules/src/progressbar/progressbar.ts 30,33 @@ -3995,6 +3995,7 @@ blocks + блокови src/app/components/pool-ranking/pool-ranking.component.ts 165,163 diff --git a/frontend/src/locale/messages.zh.xlf b/frontend/src/locale/messages.zh.xlf index eddfdf5d7..ceb38745f 100644 --- a/frontend/src/locale/messages.zh.xlf +++ b/frontend/src/locale/messages.zh.xlf @@ -2365,6 +2365,7 @@ Marginal fee rate + 边际费率 src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 40 @@ -2377,6 +2378,7 @@ Recently broadcasted + 最近播出 src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 41 @@ -2537,6 +2539,7 @@ Size per weight + 尺寸/权重 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts 200,199 @@ -2747,6 +2750,7 @@ Subsidy + fees + 补贴+费用 src/app/components/block/block.component.html 153,156 @@ -2760,6 +2764,7 @@ Expected + 预计区块 src/app/components/block/block.component.html 216 @@ -2781,6 +2786,7 @@ Actual + 实际区块 src/app/components/block/block.component.html 218,222 @@ -2789,6 +2795,7 @@ Expected Block + 预计区块 src/app/components/block/block.component.html 222 @@ -2797,6 +2804,7 @@ Actual Block + 实际区块 src/app/components/block/block.component.html 231 @@ -2870,6 +2878,7 @@ Audit + 审计 src/app/components/block/block.component.html 297,301 @@ -2930,6 +2939,7 @@ Why is this block empty? + 为什么这个区块是空的？ src/app/components/block/block.component.html 384,390 @@ -3193,6 +3203,7 @@ blocks expected + 预计个区块 src/app/components/difficulty/difficulty-tooltip.component.html 13 @@ -3201,6 +3212,7 @@ block expected + 预计个区块 src/app/components/difficulty/difficulty-tooltip.component.html 14 @@ -3209,6 +3221,7 @@ blocks mined + 已挖个区块 src/app/components/difficulty/difficulty-tooltip.component.html 18 @@ -3217,6 +3230,7 @@ block mined + 已挖个区块 src/app/components/difficulty/difficulty-tooltip.component.html 19 @@ -3225,6 +3239,7 @@ blocks remaining + 剩余个区块 src/app/components/difficulty/difficulty-tooltip.component.html 24 @@ -3233,6 +3248,7 @@ block remaining + 剩余个区块 src/app/components/difficulty/difficulty-tooltip.component.html 25 @@ -3241,6 +3257,7 @@ blocks ahead + 领先个区块 src/app/components/difficulty/difficulty-tooltip.component.html 29 @@ -3249,6 +3266,7 @@ block ahead + 领先个区块 src/app/components/difficulty/difficulty-tooltip.component.html 30 @@ -3257,6 +3275,7 @@ blocks behind + 落后个区块 src/app/components/difficulty/difficulty-tooltip.component.html 34 @@ -3265,6 +3284,7 @@ block behind + 落后个区块 src/app/components/difficulty/difficulty-tooltip.component.html 35 @@ -3273,6 +3293,7 @@ Average block time + 平均出块时间 src/app/components/difficulty/difficulty.component.html 42,45 @@ -3917,6 +3938,7 @@ Avg Health + 平均健康 src/app/components/pool-ranking/pool-ranking.component.html 96,97 @@ -3973,6 +3995,7 @@ blocks + 个区块 src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -3992,6 +4015,7 @@ Other () + 其他 () src/app/components/pool-ranking/pool-ranking.component.ts 201 @@ -4270,6 +4294,7 @@ Avg Block Fees + 平均区块费用 src/app/components/reward-stats/reward-stats.component.html 17 @@ -4282,6 +4307,7 @@ Average fees per block in the past 144 blocks + 过去144个区块中每个区块的平均费用 src/app/components/reward-stats/reward-stats.component.html 18,20 @@ -4363,6 +4389,7 @@ Bitcoin Block Height + 比特币区块高度 src/app/components/search-form/search-results/search-results.component.html 3 @@ -4371,6 +4398,7 @@ Bitcoin Transaction + 比特币交易 src/app/components/search-form/search-results/search-results.component.html 9 @@ -4379,6 +4407,7 @@ Bitcoin Address + 比特币地址 src/app/components/search-form/search-results/search-results.component.html 15 @@ -4387,6 +4416,7 @@ Bitcoin Block + 比特币区块 src/app/components/search-form/search-results/search-results.component.html 21 @@ -4395,6 +4425,7 @@ Bitcoin Addresses + 比特币地址 src/app/components/search-form/search-results/search-results.component.html 27 @@ -4403,6 +4434,7 @@ Lightning Nodes + 闪电网络节点 src/app/components/search-form/search-results/search-results.component.html 35 @@ -4411,6 +4443,7 @@ Lightning Channels + 闪电网络通道 src/app/components/search-form/search-results/search-results.component.html 43 @@ -4675,6 +4708,7 @@ This transaction replaced: + 此交易取代: src/app/components/transaction/transaction.component.html 10,12 @@ -4684,6 +4718,7 @@ Replaced + 已更换 src/app/components/transaction/transaction.component.html 36,39 @@ -5023,6 +5058,7 @@ Show more inputs to reveal fee data + 显示更多输入以显示费用数据 src/app/components/transactions-list/transactions-list.component.html 290,293 @@ -5031,6 +5067,7 @@ remaining + 剩余 src/app/components/transactions-list/transactions-list.component.html 332,333 @@ -5181,6 +5218,7 @@ This transaction does not use Taproot + 此交易不使用Taproot src/app/components/tx-features/tx-features.component.html 18 @@ -5324,6 +5362,7 @@ mempool.space merely provides data about the Bitcoin network. It cannot help you with retrieving funds, confirming your transaction quicker, etc. + mempool.space 仅提供有关比特币网络的数据。 它无法帮助您取回资金、更快地确认您的交易等。 src/app/docs/api-docs/api-docs.component.html 13 @@ -5556,6 +5595,7 @@ Starting balance + 期初余额 src/app/lightning/channel/channel-close-box/channel-close-box.component.html 6 @@ -5565,6 +5605,7 @@ Closing balance + 期末余额 src/app/lightning/channel/channel-close-box/channel-close-box.component.html 12 @@ -5796,6 +5837,7 @@ Closed by + 关闭者 src/app/lightning/channel/channel.component.html 59,61 @@ -5830,6 +5872,7 @@ Mutually closed + 相互封闭 src/app/lightning/channel/closing-type/closing-type.component.ts 20 @@ -5837,6 +5880,7 @@ Force closed + 强制关闭 src/app/lightning/channel/closing-type/closing-type.component.ts 24 @@ -5844,6 +5888,7 @@ Force closed with penalty + 强制关闭并受到惩罚 src/app/lightning/channel/closing-type/closing-type.component.ts 28 @@ -5977,6 +6022,7 @@ avg + 平均 src/app/lightning/channels-statistics/channels-statistics.component.html 3,5 @@ -5985,6 +6031,7 @@ med + 中位 src/app/lightning/channels-statistics/channels-statistics.component.html 6,9 @@ -6370,6 +6417,7 @@ Fee distribution + 费用分配 src/app/lightning/node-fee-chart/node-fee-chart.component.html 2 @@ -6378,6 +6426,7 @@ Outgoing Fees + 支出费用 src/app/lightning/node-fee-chart/node-fee-chart.component.ts 170 @@ -6389,6 +6438,7 @@ Incoming Fees + 进场费 src/app/lightning/node-fee-chart/node-fee-chart.component.ts 178 @@ -6478,6 +6528,7 @@ Avg channel distance + 平均频道距离 src/app/lightning/node/node.component.html 59,60 @@ -6517,6 +6568,7 @@ Liquidity ad + 流动性广告 src/app/lightning/node/node.component.html 141,144 @@ -6525,6 +6577,7 @@ Lease fee rate + 租赁费率 src/app/lightning/node/node.component.html 147,150 @@ -6534,6 +6587,7 @@ Lease base fee + 租赁基本费 src/app/lightning/node/node.component.html 155,157 @@ -6542,6 +6596,7 @@ Funding weight + 资金权重 src/app/lightning/node/node.component.html 161,162 @@ -6569,6 +6624,7 @@ Compact lease + 协议合约 src/app/lightning/node/node.component.html 191,193 @@ -6577,6 +6633,7 @@ TLV extension records + TLV 扩展记录 src/app/lightning/node/node.component.html 202,205 @@ -6657,6 +6714,7 @@ Indexing in progress + 正在编制索引 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 121,116 @@ -6668,6 +6726,7 @@ Clearnet and Darknet + 明网和暗网 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -6679,6 +6738,7 @@ Clearnet Only (IPv4, IPv6) + 仅限明网（IPv4、IPv6） src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -6690,6 +6750,7 @@ Darknet Only (Tor, I2P, cjdns) + 仅限暗网（Tor、I2P、cjdns） src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -6714,6 +6775,7 @@ nodes + 个节点 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts 104,103 @@ -6924,6 +6986,7 @@ Active nodes + 活跃节点 src/app/lightning/nodes-per-isp/nodes-per-isp.component.html 14,18 From adc51f621743523503be04b66a9997750d7ee048 Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Sat, 18 Mar 2023 16:40:30 +0900 Subject: [PATCH 34/60] Update i18n --- frontend/src/app/components/pool/pool.component.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/components/pool/pool.component.html b/frontend/src/app/components/pool/pool.component.html index aa54b70f5..57d7ac51c 100644 --- a/frontend/src/app/components/pool/pool.component.html +++ b/frontend/src/app/components/pool/pool.component.html @@ -92,9 +92,9 @@ - - - + + + @@ -117,9 +117,9 @@
RewardHashrate (24h)Avg HealthRewardHashrate (24h)Avg Health
- - - + + + From 6be9f237902926f340e5e5b4196666cb7dfbba03 Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Sat, 18 Mar 2023 04:57:20 -0400 Subject: [PATCH 35/60] Add more languages for promo captions --- .../src/app/components/about/about.component.html | 13 ++++++++++++- frontend/sync-assets.js | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 17920157f..c2147c8b4 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -16,7 +16,18 @@
diff --git a/frontend/sync-assets.js b/frontend/sync-assets.js index 9512116fa..953811fae 100644 --- a/frontend/sync-assets.js +++ b/frontend/sync-assets.js @@ -84,7 +84,7 @@ const testnetAssetsMinimalJsonUrl = 'https://raw.githubusercontent.com/Blockstre const promoPrefix = PATH + 'promo-video/'; const promoVideoFile = promoPrefix + 'mempool-promo.mp4'; const promoVideoUrl = 'https://raw.githubusercontent.com/mempool/mempool-promo/master/promo.mp4'; -const promoVideoLanguages = ['en','sv','ja']; +const promoVideoLanguages = ['en','sv','ja','zh','cs','fi','fr','de','it','lt','nb','fa','pl','ro','pt']; console.log('Downloading assets'); download(PATH + 'assets.json', assetsJsonUrl); From ed46232b837854ed6b531c774d88b72aae0657c9 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Tue, 21 Feb 2023 22:23:36 -0600 Subject: [PATCH 36/60] Fix missing fees in liquid block tooltips --- backend/src/api/blocks.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts index 15c8590e9..8ed81016b 100644 --- a/backend/src/api/blocks.ts +++ b/backend/src/api/blocks.ts @@ -143,7 +143,10 @@ class Blocks { * @returns BlockSummary */ public summarizeBlock(block: IBitcoinApi.VerboseBlock): BlockSummary { - const stripped = block.tx.map((tx) => { + if (Common.isLiquid()) { + block = this.convertLiquidFees(block); + } + const stripped = block.tx.map((tx: IBitcoinApi.VerboseTransaction) => { return { txid: tx.txid, vsize: tx.weight / 4, @@ -158,6 +161,13 @@ class Blocks { }; } + private convertLiquidFees(block: IBitcoinApi.VerboseBlock): IBitcoinApi.VerboseBlock { + block.tx.forEach(tx => { + tx.fee = Object.values(tx.fee || {}).reduce((total, output) => total + output, 0); + }); + return block; + } + /** * Return a block with additional data (reward, coinbase, fees...) * @param block From 994656953c9941458fd27bc65d42fe3a02acb3f3 Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Sat, 18 Mar 2023 05:15:48 -0400 Subject: [PATCH 37/60] Fix promo video subtitles for sv --- frontend/src/app/components/about/about.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index e3917256e..16d1e60ed 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -16,7 +16,7 @@
- -
RewardHashrate (24h)Avg HealthRewardHashrate (24h)Avg Health
+ {{ block.height }} @@ -89,7 +89,6 @@ - @@ -98,7 +97,7 @@ + diff --git a/frontend/src/app/components/blocks-list/blocks-list.component.scss b/frontend/src/app/components/blocks-list/blocks-list.component.scss index 1a32f7ed7..ea6e93347 100644 --- a/frontend/src/app/components/blocks-list/blocks-list.component.scss +++ b/frontend/src/app/components/blocks-list/blocks-list.component.scss @@ -51,7 +51,12 @@ tr, td, th { .pool.widget { width: 40%; padding-left: 24px; - @media (max-width: 376px) { + @media (min-width: 768px) AND (max-width: 926px) { + padding-left: 0px; + width: 60%; + } + @media (max-width: 430px) { + padding-left: 0px; width: 60%; } } @@ -59,6 +64,10 @@ tr, td, th { display: inline-block; vertical-align: text-top; padding-left: 10px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + max-width: 160px; } .height { @@ -69,6 +78,12 @@ tr, td, th { @media (max-width: 576px) { width: 10%; } + @media (min-width: 768px) AND (max-width: 926px) { + width: 30%; + } + @media (max-width: 430px) { + width: 30%; + } } .height.legacy { width: 15%; @@ -92,7 +107,7 @@ tr, td, th { .mined { width: 13%; - @media (max-width: 576px) { + @media (max-width: 730px) { display: none; } } @@ -138,7 +153,7 @@ tr, td, th { .fees { width: 8%; - @media (max-width: 650px) { + @media (max-width: 820px) { display: none; } } @@ -163,6 +178,16 @@ tr, td, th { width: 30%; padding-right: 0; } + @media (min-width: 768px) AND (max-width: 926px) { + overflow: hidden; + text-overflow: ellipsis; + max-width: 90px; + } + @media (max-width: 430px) { + overflow: hidden; + text-overflow: ellipsis; + max-width: 90px; + } } .size { @@ -189,10 +214,10 @@ tr, td, th { .health { width: 10%; - @media (max-width: 1000px) { + @media (max-width: 1105px) { width: 13%; } - @media (max-width: 950px) { + @media (max-width: 560px) { display: none; } @@ -202,7 +227,7 @@ tr, td, th { } .health.widget { width: 25%; - @media (max-width: 1000px) { + @media (max-width: 1105px) { display: none; } @media (max-width: 767px) { @@ -242,4 +267,4 @@ tr, td, th { vertical-align: middle; max-width: 50vw; text-align: left; -} \ No newline at end of file +} diff --git a/frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html b/frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html index 0950a11ed..dace043f8 100644 --- a/frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html +++ b/frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html @@ -2,17 +2,18 @@ - - - - + + + + - - + @@ -23,8 +24,8 @@ - - + + diff --git a/frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.scss b/frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.scss index f379effe2..f53c052db 100644 --- a/frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.scss +++ b/frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.scss @@ -17,3 +17,12 @@ } } } + +.date { + @media (min-width: 767px) AND (max-width: 991px) { + display: none; + } + @media (max-width: 500px) { + display: none; + } +} \ No newline at end of file From af6d115dbb6d9db602f75751f6c3425c9c6b7dec Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Sun, 19 Mar 2023 15:39:17 +0900 Subject: [PATCH 44/60] Add missing MAXMIND in docker configs - Remove duplicated `__MEMPOOL_INDEXING_BLOCKS_AMOUNT__` --- backend/src/__tests__/config.test.ts | 7 +++++++ docker/README.md | 23 +++++++++++++++++++++++ docker/backend/mempool-config.json | 6 ++++++ docker/backend/start.sh | 16 ++++++++++++++-- 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/backend/src/__tests__/config.test.ts b/backend/src/__tests__/config.test.ts index 5717808dd..8b7ebc9ce 100644 --- a/backend/src/__tests__/config.test.ts +++ b/backend/src/__tests__/config.test.ts @@ -106,6 +106,13 @@ describe('Mempool Backend Config', () => { BISQ_URL: 'https://bisq.markets/api', BISQ_ONION: 'http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api' }); + + expect(config.MAXMIND).toStrictEqual({ + ENABLED: false, + GEOLITE2_CITY: '/usr/local/share/GeoIP/GeoLite2-City.mmdb', + GEOLITE2_ASN: '/usr/local/share/GeoIP/GeoLite2-ASN.mmdb', + GEOIP2_ISP: '/usr/local/share/GeoIP/GeoIP2-ISP.mmdb' + }); }); }); diff --git a/docker/README.md b/docker/README.md index 468d8069b..34f130aae 100644 --- a/docker/README.md +++ b/docker/README.md @@ -432,3 +432,26 @@ Corresponding `docker-compose.yml` overrides: CLIGHTNING_SOCKET: "" ... ``` + +
+ +`mempool-config.json`: +```json + "MAXMIND": { + "ENABLED": false, + "GEOLITE2_CITY": "/usr/local/share/GeoIP/GeoLite2-City.mmdb", + "GEOLITE2_ASN": "/usr/local/share/GeoIP/GeoLite2-ASN.mmdb", + "GEOIP2_ISP": "/usr/local/share/GeoIP/GeoIP2-ISP.mmdb" + } +``` + +Corresponding `docker-compose.yml` overrides: +```yaml + api: + environment: + MAXMIND_ENABLED: "", + MAXMIND_GEOLITE2_CITY: "/usr/local/share/GeoIP/GeoLite2-City.mmdb", + MAXMIND_GEOLITE2_ASN": "/usr/local/share/GeoIP/GeoLite2-ASN.mmdb", + MAXMIND_GEOIP2_ISP": "/usr/local/share/GeoIP/GeoIP2-ISP.mmdb" + ... +``` diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json index 78a2c116b..0099a650d 100644 --- a/docker/backend/mempool-config.json +++ b/docker/backend/mempool-config.json @@ -107,5 +107,11 @@ "LIQUID_ONION": "__EXTERNAL_DATA_SERVER_LIQUID_ONION__", "BISQ_URL": "__EXTERNAL_DATA_SERVER_BISQ_URL__", "BISQ_ONION": "__EXTERNAL_DATA_SERVER_BISQ_ONION__" + }, + "MAXMIND": { + "ENABLED": "__MAXMIND_ENABLED__", + "GEOLITE2_CITY": "__MAXMIND_GEOLITE2_CITY__", + "GEOLITE2_ASN": "__MAXMIND_GEOLITE2_ASN__", + "GEOIP2_ISP": "__MAXMIND_GEOIP2_ISP__" } } \ No newline at end of file diff --git a/docker/backend/start.sh b/docker/backend/start.sh index ee5069386..d0e58470b 100755 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -22,7 +22,6 @@ __MEMPOOL_EXTERNAL_MAX_RETRY__=${MEMPOOL_EXTERNAL_MAX_RETRY:=1} __MEMPOOL_EXTERNAL_RETRY_INTERVAL__=${MEMPOOL_EXTERNAL_RETRY_INTERVAL:=0} __MEMPOOL_USER_AGENT__=${MEMPOOL_USER_AGENT:=mempool} __MEMPOOL_STDOUT_LOG_MIN_PRIORITY__=${MEMPOOL_STDOUT_LOG_MIN_PRIORITY:=info} -__MEMPOOL_INDEXING_BLOCKS_AMOUNT__=${MEMPOOL_INDEXING_BLOCKS_AMOUNT:=false} __MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__=${MEMPOOL_AUTOMATIC_BLOCK_REINDEXING:=false} __MEMPOOL_POOLS_JSON_URL__=${MEMPOOL_POOLS_JSON_URL:=https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json} __MEMPOOL_POOLS_JSON_TREE_URL__=${MEMPOOL_POOLS_JSON_TREE_URL:=https://api.github.com/repos/mempool/mining-pools/git/trees/master} @@ -112,6 +111,13 @@ __LND_REST_API_URL__=${LND_REST_API_URL:="https://localhost:8080"} # CLN __CLIGHTNING_SOCKET__=${CLIGHTNING_SOCKET:=""} +# MAXMIND +__MAXMIND_ENABLED__=${MAXMIND_ENABLED:=false} +__MAXMIND_GEOLITE2_CITY__=${MAXMIND_GEOLITE2_CITY:="/usr/local/share/GeoIP/GeoLite2-City.mmdb"} +__MAXMIND_GEOLITE2_ASN__=${MAXMIND_GEOLITE2_ASN:="/usr/local/share/GeoIP/GeoLite2-ASN.mmdb"} +__MAXMIND_GEOIP2_ISP__=${MAXMIND_GEOIP2_IS:="/usr/local/share/GeoIP/GeoIP2-ISP.mmdb"} + + mkdir -p "${__MEMPOOL_CACHE_DIR__}" sed -i "s/__MEMPOOL_NETWORK__/${__MEMPOOL_NETWORK__}/g" mempool-config.json @@ -135,7 +141,6 @@ sed -i "s!__MEMPOOL_EXTERNAL_MAX_RETRY__!${__MEMPOOL_EXTERNAL_MAX_RETRY__}!g" me sed -i "s!__MEMPOOL_EXTERNAL_RETRY_INTERVAL__!${__MEMPOOL_EXTERNAL_RETRY_INTERVAL__}!g" mempool-config.json sed -i "s!__MEMPOOL_USER_AGENT__!${__MEMPOOL_USER_AGENT__}!g" mempool-config.json sed -i "s/__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__/${__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__}/g" mempool-config.json -sed -i "s/__MEMPOOL_INDEXING_BLOCKS_AMOUNT__/${__MEMPOOL_INDEXING_BLOCKS_AMOUNT__}/g" mempool-config.json sed -i "s/__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__/${__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__}/g" mempool-config.json sed -i "s!__MEMPOOL_POOLS_JSON_URL__!${__MEMPOOL_POOLS_JSON_URL__}!g" mempool-config.json sed -i "s!__MEMPOOL_POOLS_JSON_TREE_URL__!${__MEMPOOL_POOLS_JSON_TREE_URL__}!g" mempool-config.json @@ -215,4 +220,11 @@ sed -i "s!__LND_REST_API_URL__!${__LND_REST_API_URL__}!g" mempool-config.json # CLN sed -i "s!__CLIGHTNING_SOCKET__!${__CLIGHTNING_SOCKET__}!g" mempool-config.json +# MAXMIND +sed -i "s!__MAXMIND_ENABLED__!${__MAXMIND_ENABLED__}!g" mempool-config.json +sed -i "s!__MAXMIND_GEOLITE2_CITY__!${__MAXMIND_GEOLITE2_CITY__}!g" mempool-config.json +sed -i "s!__MAXMIND_GEOLITE2_ASN__!${__MAXMIND_GEOLITE2_ASN__}!g" mempool-config.json +sed -i "s!__MAXMIND_GEOIP2_ISP__!${__MAXMIND_GEOIP2_ISP__}!g" mempool-config.json + + node /backend/package/index.js From e27bdd3e2b3c34a7f037079cec6586c026b27c25 Mon Sep 17 00:00:00 2001 From: softsimon Date: Sun, 19 Mar 2023 17:30:06 +0900 Subject: [PATCH 45/60] Fixing broken liquid blinding tests --- frontend/cypress/e2e/liquid/liquid.spec.ts | 10 +++++----- .../cypress/e2e/liquidtestnet/liquidtestnet.spec.ts | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/cypress/e2e/liquid/liquid.spec.ts b/frontend/cypress/e2e/liquid/liquid.spec.ts index e22a9b94e..325a2ad0c 100644 --- a/frontend/cypress/e2e/liquid/liquid.spec.ts +++ b/frontend/cypress/e2e/liquid/liquid.spec.ts @@ -158,10 +158,10 @@ describe('Liquid', () => { it('show empty unblinded TX', () => { cy.visit(`${basePath}/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=`); cy.waitForSkeletonGone(); - cy.get('.table-tx-vin tr:nth-child(1)').should('have.class', ''); + cy.get('.table-tx-vin tr:nth-child(1)').should('have.class', 'ng-star-inserted'); cy.get('.table-tx-vin tr:nth-child(1) .amount').should('contain.text', 'Confidential'); - cy.get('.table-tx-vout tr:nth-child(1)').should('have.class', ''); - cy.get('.table-tx-vout tr:nth-child(2)').should('have.class', ''); + cy.get('.table-tx-vout tr:nth-child(1)').should('have.class', 'ng-star-inserted'); + cy.get('.table-tx-vout tr:nth-child(2)').should('have.class', 'ng-star-inserted'); cy.get('.table-tx-vout tr:nth-child(1) .amount').should('contain.text', 'Confidential'); cy.get('.table-tx-vout tr:nth-child(2) .amount').should('contain.text', 'Confidential'); }); @@ -169,8 +169,8 @@ describe('Liquid', () => { it('show invalid unblinded TX hex', () => { cy.visit(`${basePath}/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=123`); cy.waitForSkeletonGone(); - cy.get('.table-tx-vin tr').should('have.class', ''); - cy.get('.table-tx-vout tr').should('have.class', ''); + cy.get('.table-tx-vin tr').should('have.class', 'ng-star-inserted'); + cy.get('.table-tx-vout tr').should('have.class', 'ng-star-inserted'); cy.get('.error-unblinded').contains('Error: Invalid blinding data (invalid hex)'); }); diff --git a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts index e1172e51a..1f959dd3a 100644 --- a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts +++ b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts @@ -109,10 +109,10 @@ describe('Liquid Testnet', () => { it('show empty unblinded TX', () => { cy.visit(`${basePath}/tx/c3d908ab77891e4c569b0df71aae90f4720b157019ebb20db176f4f9c4d626b8#blinded=`); cy.waitForSkeletonGone(); - cy.get('.table-tx-vin tr:nth-child(1)').should('have.class', ''); + cy.get('.table-tx-vin tr:nth-child(1)').should('have.class', 'ng-star-inserted'); cy.get('.table-tx-vin tr:nth-child(1) .amount').should('contain.text', 'Confidential'); - cy.get('.table-tx-vout tr:nth-child(1)').should('have.class', ''); - cy.get('.table-tx-vout tr:nth-child(2)').should('have.class', ''); + cy.get('.table-tx-vout tr:nth-child(1)').should('have.class', 'ng-star-inserted'); + cy.get('.table-tx-vout tr:nth-child(2)').should('have.class', 'ng-star-inserted'); cy.get('.table-tx-vout tr:nth-child(1) .amount').should('contain.text', 'Confidential'); cy.get('.table-tx-vout tr:nth-child(2) .amount').should('contain.text', 'Confidential'); }); @@ -120,8 +120,8 @@ describe('Liquid Testnet', () => { it('show invalid unblinded TX hex', () => { cy.visit(`${basePath}/tx/2477f220eef1d03f8ffa4a2861c275d155c3562adf0d79523aeeb0c59ee611ba#blinded=5000`); cy.waitForSkeletonGone(); - cy.get('.table-tx-vin tr').should('have.class', ''); - cy.get('.table-tx-vout tr').should('have.class', ''); + cy.get('.table-tx-vin tr').should('have.class', 'ng-star-inserted'); + cy.get('.table-tx-vout tr').should('have.class', 'ng-star-inserted'); cy.get('.error-unblinded').contains('Error: Invalid blinding data (invalid hex)'); }); From e2e71c7a4688bafe863110beb59cea01d20d279d Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 19 Mar 2023 17:33:51 +0900 Subject: [PATCH 46/60] Add Maxmind GeoIP Lite download to Docker build --- backend/src/__tests__/config.test.ts | 8 ++++---- docker/README.md | 10 +++++----- docker/backend/Dockerfile | 1 + docker/backend/mempool-config.json | 2 +- docker/backend/start.sh | 8 ++++---- docker/init.sh | 5 +++++ 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/backend/src/__tests__/config.test.ts b/backend/src/__tests__/config.test.ts index 8b7ebc9ce..72533829b 100644 --- a/backend/src/__tests__/config.test.ts +++ b/backend/src/__tests__/config.test.ts @@ -108,10 +108,10 @@ describe('Mempool Backend Config', () => { }); expect(config.MAXMIND).toStrictEqual({ - ENABLED: false, - GEOLITE2_CITY: '/usr/local/share/GeoIP/GeoLite2-City.mmdb', - GEOLITE2_ASN: '/usr/local/share/GeoIP/GeoLite2-ASN.mmdb', - GEOIP2_ISP: '/usr/local/share/GeoIP/GeoIP2-ISP.mmdb' + ENABLED: true, + GEOLITE2_CITY: './backend/GeoIP/GeoLite2-City.mmdb', + GEOLITE2_ASN: './backend/GeoIP/GeoLite2-ASN.mmdb', + GEOIP2_ISP: '' }); }); }); diff --git a/docker/README.md b/docker/README.md index 34f130aae..e6f6a3c07 100644 --- a/docker/README.md +++ b/docker/README.md @@ -438,7 +438,7 @@ Corresponding `docker-compose.yml` overrides: `mempool-config.json`: ```json "MAXMIND": { - "ENABLED": false, + "ENABLED": true, "GEOLITE2_CITY": "/usr/local/share/GeoIP/GeoLite2-City.mmdb", "GEOLITE2_ASN": "/usr/local/share/GeoIP/GeoLite2-ASN.mmdb", "GEOIP2_ISP": "/usr/local/share/GeoIP/GeoIP2-ISP.mmdb" @@ -449,9 +449,9 @@ Corresponding `docker-compose.yml` overrides: ```yaml api: environment: - MAXMIND_ENABLED: "", - MAXMIND_GEOLITE2_CITY: "/usr/local/share/GeoIP/GeoLite2-City.mmdb", - MAXMIND_GEOLITE2_ASN": "/usr/local/share/GeoIP/GeoLite2-ASN.mmdb", - MAXMIND_GEOIP2_ISP": "/usr/local/share/GeoIP/GeoIP2-ISP.mmdb" + MAXMIND_ENABLED: true, + MAXMIND_GEOLITE2_CITY: "./backend/GeoIP/GeoLite2-City.mmdb", + MAXMIND_GEOLITE2_ASN": "./backend/GeoIP/GeoLite2-ASN.mmdb", + MAXMIND_GEOIP2_ISP": "./backend/GeoIP/GeoIP2-ISP.mmdb" ... ``` diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 9be457bb2..fd5044c0f 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -17,6 +17,7 @@ WORKDIR /backend RUN chown 1000:1000 ./ COPY --from=builder --chown=1000:1000 /build/package ./package/ +COPY --from=builder --chown=1000:1000 /build/GeoIP ./GeoIP/ COPY --from=builder --chown=1000:1000 /build/mempool-config.json /build/start.sh /build/wait-for-it.sh ./ USER 1000 diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json index 0099a650d..c1f187437 100644 --- a/docker/backend/mempool-config.json +++ b/docker/backend/mempool-config.json @@ -114,4 +114,4 @@ "GEOLITE2_ASN": "__MAXMIND_GEOLITE2_ASN__", "GEOIP2_ISP": "__MAXMIND_GEOIP2_ISP__" } -} \ No newline at end of file +} diff --git a/docker/backend/start.sh b/docker/backend/start.sh index d0e58470b..11c638735 100755 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -112,10 +112,10 @@ __LND_REST_API_URL__=${LND_REST_API_URL:="https://localhost:8080"} __CLIGHTNING_SOCKET__=${CLIGHTNING_SOCKET:=""} # MAXMIND -__MAXMIND_ENABLED__=${MAXMIND_ENABLED:=false} -__MAXMIND_GEOLITE2_CITY__=${MAXMIND_GEOLITE2_CITY:="/usr/local/share/GeoIP/GeoLite2-City.mmdb"} -__MAXMIND_GEOLITE2_ASN__=${MAXMIND_GEOLITE2_ASN:="/usr/local/share/GeoIP/GeoLite2-ASN.mmdb"} -__MAXMIND_GEOIP2_ISP__=${MAXMIND_GEOIP2_IS:="/usr/local/share/GeoIP/GeoIP2-ISP.mmdb"} +__MAXMIND_ENABLED__=${MAXMIND_ENABLED:=true} +__MAXMIND_GEOLITE2_CITY__=${MAXMIND_GEOLITE2_CITY:="./backend/GeoIP/GeoLite2-City.mmdb"} +__MAXMIND_GEOLITE2_ASN__=${MAXMIND_GEOLITE2_ASN:="./backend/GeoIP/GeoLite2-ASN.mmdb"} +__MAXMIND_GEOIP2_ISP__=${MAXMIND_GEOIP2_ISP:=""} mkdir -p "${__MEMPOOL_CACHE_DIR__}" diff --git a/docker/init.sh b/docker/init.sh index 4eb06f0c1..ee9ac9542 100755 --- a/docker/init.sh +++ b/docker/init.sh @@ -3,6 +3,11 @@ #backend cp ./docker/backend/* ./backend/ +#geoip-data +mkdir -p ./backend/GeoIP/ +wget -O ./backend/GeoIP/GeoLite2-City.mmdb https://raw.githubusercontent.com/mempool/geoip-data/master/GeoLite2-City.mmdb +wget -O ./backend/GeoIP/GeoLite2-ASN.mmdb https://raw.githubusercontent.com/mempool/geoip-data/master/GeoLite2-ASN.mmdb + #frontend localhostIP="127.0.0.1" cp ./docker/frontend/* ./frontend From 0abb9cbb7c4a58f0cebab61c9b4f2f1346bcfa2b Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 19 Mar 2023 17:49:37 +0900 Subject: [PATCH 47/60] Fix boolean configuration option in docker backend config --- docker/backend/mempool-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json index c1f187437..1b3ac1837 100644 --- a/docker/backend/mempool-config.json +++ b/docker/backend/mempool-config.json @@ -109,7 +109,7 @@ "BISQ_ONION": "__EXTERNAL_DATA_SERVER_BISQ_ONION__" }, "MAXMIND": { - "ENABLED": "__MAXMIND_ENABLED__", + "ENABLED": __MAXMIND_ENABLED__, "GEOLITE2_CITY": "__MAXMIND_GEOLITE2_CITY__", "GEOLITE2_ASN": "__MAXMIND_GEOLITE2_ASN__", "GEOIP2_ISP": "__MAXMIND_GEOIP2_ISP__" From 32c2db2153877057dbfc5be43ffbfaa06bc50ec1 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 19 Mar 2023 18:00:37 +0900 Subject: [PATCH 48/60] Fix backend docker config path for GeoIP data --- docker/README.md | 6 +++--- docker/backend/start.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/README.md b/docker/README.md index e6f6a3c07..525ecb718 100644 --- a/docker/README.md +++ b/docker/README.md @@ -450,8 +450,8 @@ Corresponding `docker-compose.yml` overrides: api: environment: MAXMIND_ENABLED: true, - MAXMIND_GEOLITE2_CITY: "./backend/GeoIP/GeoLite2-City.mmdb", - MAXMIND_GEOLITE2_ASN": "./backend/GeoIP/GeoLite2-ASN.mmdb", - MAXMIND_GEOIP2_ISP": "./backend/GeoIP/GeoIP2-ISP.mmdb" + MAXMIND_GEOLITE2_CITY: "/backend/GeoIP/GeoLite2-City.mmdb", + MAXMIND_GEOLITE2_ASN": "/backend/GeoIP/GeoLite2-ASN.mmdb", + MAXMIND_GEOIP2_ISP": "/backend/GeoIP/GeoIP2-ISP.mmdb" ... ``` diff --git a/docker/backend/start.sh b/docker/backend/start.sh index 11c638735..fced20974 100755 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -113,8 +113,8 @@ __CLIGHTNING_SOCKET__=${CLIGHTNING_SOCKET:=""} # MAXMIND __MAXMIND_ENABLED__=${MAXMIND_ENABLED:=true} -__MAXMIND_GEOLITE2_CITY__=${MAXMIND_GEOLITE2_CITY:="./backend/GeoIP/GeoLite2-City.mmdb"} -__MAXMIND_GEOLITE2_ASN__=${MAXMIND_GEOLITE2_ASN:="./backend/GeoIP/GeoLite2-ASN.mmdb"} +__MAXMIND_GEOLITE2_CITY__=${MAXMIND_GEOLITE2_CITY:="/backend/GeoIP/GeoLite2-City.mmdb"} +__MAXMIND_GEOLITE2_ASN__=${MAXMIND_GEOLITE2_ASN:="/backend/GeoIP/GeoLite2-ASN.mmdb"} __MAXMIND_GEOIP2_ISP__=${MAXMIND_GEOIP2_ISP:=""} From 1ed20a95df30816a2e3b7593e6cef66eb2be4e42 Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Sun, 19 Mar 2023 22:58:39 -0400 Subject: [PATCH 49/60] Add poster image for readme video Also add line-break after video and remove screenshot. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d2f9f9382..b7a455cd5 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # The Mempool Open Source Project™ [![mempool](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/ry4br7/master&style=flat-square)](https://dashboard.cypress.io/projects/ry4br7/runs) -https://user-images.githubusercontent.com/232186/222445818-234aa6c9-c233-4c52-b3f0-e32b8232893b.mp4 +https://user-images.githubusercontent.com/93150691/226236121-375ea64f-b4a1-4cc0-8fad-a6fb33226840.mp4 + +
Mempool is the fully-featured mempool visualizer, explorer, and API service running at [mempool.space](https://mempool.space/). It is an open-source project developed and operated for the benefit of the Bitcoin community, with a focus on the emerging transaction fee market that is evolving Bitcoin into a multi-layer ecosystem. -![mempool](https://mempool.space/resources/screenshots/v2.4.0-dashboard.png) - # Installation Methods Mempool can be self-hosted on a wide variety of your own hardware, ranging from a simple one-click installation on a Raspberry Pi full-node distro all the way to a robust production instance on a powerful FreeBSD server. From ad5ce6dba4a793f00b15db29f51865913eb1f912 Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Mon, 20 Mar 2023 14:02:31 +0900 Subject: [PATCH 50/60] Fix maxmind tests --- backend/src/__tests__/config.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/__tests__/config.test.ts b/backend/src/__tests__/config.test.ts index 72533829b..8b7ebc9ce 100644 --- a/backend/src/__tests__/config.test.ts +++ b/backend/src/__tests__/config.test.ts @@ -108,10 +108,10 @@ describe('Mempool Backend Config', () => { }); expect(config.MAXMIND).toStrictEqual({ - ENABLED: true, - GEOLITE2_CITY: './backend/GeoIP/GeoLite2-City.mmdb', - GEOLITE2_ASN: './backend/GeoIP/GeoLite2-ASN.mmdb', - GEOIP2_ISP: '' + ENABLED: false, + GEOLITE2_CITY: '/usr/local/share/GeoIP/GeoLite2-City.mmdb', + GEOLITE2_ASN: '/usr/local/share/GeoIP/GeoLite2-ASN.mmdb', + GEOIP2_ISP: '/usr/local/share/GeoIP/GeoIP2-ISP.mmdb' }); }); }); From d54bcc898b7707031d317f8da57016f91881bfc4 Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 20 Mar 2023 12:07:42 +0900 Subject: [PATCH 51/60] Fix missing temp cache in disk cache --- backend/src/api/disk-cache.ts | 94 ++++++++++++++--------------------- 1 file changed, 36 insertions(+), 58 deletions(-) diff --git a/backend/src/api/disk-cache.ts b/backend/src/api/disk-cache.ts index 74b68b6be..420d8e526 100644 --- a/backend/src/api/disk-cache.ts +++ b/backend/src/api/disk-cache.ts @@ -23,16 +23,16 @@ class DiskCache { return; } process.on('SIGINT', (e) => { - this.saveCacheToDiskSync(); + this.$saveCacheToDisk(true); process.exit(2); }); process.on('SIGTERM', (e) => { - this.saveCacheToDiskSync(); + this.$saveCacheToDisk(true); process.exit(2); }); } - async $saveCacheToDisk(): Promise { + async $saveCacheToDisk(sync: boolean = false): Promise { if (!cluster.isPrimary) { return; } @@ -41,7 +41,7 @@ class DiskCache { return; } try { - logger.debug('Writing mempool and blocks data to disk cache (async)...'); + logger.debug(`Writing mempool and blocks data to disk cache (${ sync ? 'sync' : 'async' })...`); this.isWritingCache = true; const mempool = memPool.getMempool(); @@ -54,68 +54,46 @@ class DiskCache { const chunkSize = Math.floor(mempoolArray.length / DiskCache.CHUNK_FILES); - await fsPromises.writeFile(DiskCache.FILE_NAME, JSON.stringify({ - network: config.MEMPOOL.NETWORK, - cacheSchemaVersion: this.cacheSchemaVersion, - blocks: blocks.getBlocks(), - blockSummaries: blocks.getBlockSummaries(), - mempool: {}, - mempoolArray: mempoolArray.splice(0, chunkSize), - }), { flag: 'w' }); - for (let i = 1; i < DiskCache.CHUNK_FILES; i++) { - await fsPromises.writeFile(DiskCache.FILE_NAMES.replace('{number}', i.toString()), JSON.stringify({ + if (sync) { + fs.writeFileSync(DiskCache.TMP_FILE_NAME, JSON.stringify({ + network: config.MEMPOOL.NETWORK, + cacheSchemaVersion: this.cacheSchemaVersion, + blocks: blocks.getBlocks(), + blockSummaries: blocks.getBlockSummaries(), mempool: {}, mempoolArray: mempoolArray.splice(0, chunkSize), }), { flag: 'w' }); - } - logger.debug('Mempool and blocks data saved to disk cache'); - this.isWritingCache = false; - } catch (e) { - logger.warn('Error writing to cache file: ' + (e instanceof Error ? e.message : e)); - this.isWritingCache = false; - } - } + for (let i = 1; i < DiskCache.CHUNK_FILES; i++) { + fs.writeFileSync(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), JSON.stringify({ + mempool: {}, + mempoolArray: mempoolArray.splice(0, chunkSize), + }), { flag: 'w' }); + } - saveCacheToDiskSync(): void { - if (!cluster.isPrimary) { - return; - } - if (this.isWritingCache) { - logger.debug('Saving cache already in progress. Skipping.'); - return; - } - try { - logger.debug('Writing mempool and blocks data to disk cache (sync)...'); - this.isWritingCache = true; - - const mempool = memPool.getMempool(); - const mempoolArray: TransactionExtended[] = []; - for (const tx in mempool) { - mempoolArray.push(mempool[tx]); - } - - Common.shuffleArray(mempoolArray); - - const chunkSize = Math.floor(mempoolArray.length / DiskCache.CHUNK_FILES); - - fs.writeFileSync(DiskCache.TMP_FILE_NAME, JSON.stringify({ - network: config.MEMPOOL.NETWORK, - cacheSchemaVersion: this.cacheSchemaVersion, - blocks: blocks.getBlocks(), - blockSummaries: blocks.getBlockSummaries(), - mempool: {}, - mempoolArray: mempoolArray.splice(0, chunkSize), - }), { flag: 'w' }); - for (let i = 1; i < DiskCache.CHUNK_FILES; i++) { - fs.writeFileSync(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), JSON.stringify({ + fs.renameSync(DiskCache.TMP_FILE_NAME, DiskCache.FILE_NAME); + for (let i = 1; i < DiskCache.CHUNK_FILES; i++) { + fs.renameSync(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), DiskCache.FILE_NAMES.replace('{number}', i.toString())); + } + } else { + await fsPromises.writeFile(DiskCache.TMP_FILE_NAME, JSON.stringify({ + network: config.MEMPOOL.NETWORK, + cacheSchemaVersion: this.cacheSchemaVersion, + blocks: blocks.getBlocks(), + blockSummaries: blocks.getBlockSummaries(), mempool: {}, mempoolArray: mempoolArray.splice(0, chunkSize), }), { flag: 'w' }); - } + for (let i = 1; i < DiskCache.CHUNK_FILES; i++) { + await fsPromises.writeFile(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), JSON.stringify({ + mempool: {}, + mempoolArray: mempoolArray.splice(0, chunkSize), + }), { flag: 'w' }); + } - fs.renameSync(DiskCache.TMP_FILE_NAME, DiskCache.FILE_NAME); - for (let i = 1; i < DiskCache.CHUNK_FILES; i++) { - fs.renameSync(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), DiskCache.FILE_NAMES.replace('{number}', i.toString())); + await fsPromises.rename(DiskCache.TMP_FILE_NAME, DiskCache.FILE_NAME); + for (let i = 1; i < DiskCache.CHUNK_FILES; i++) { + await fsPromises.rename(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), DiskCache.FILE_NAMES.replace('{number}', i.toString())); + } } logger.debug('Mempool and blocks data saved to disk cache'); From 517cf613c1908d16dc0242ba7dd57b212d772527 Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 20 Mar 2023 15:23:02 +0900 Subject: [PATCH 52/60] Removing Sigterm. Cache write block interval configuration. --- backend/mempool-config.sample.json | 3 ++- backend/src/__fixtures__/mempool-config.template.json | 3 ++- backend/src/__tests__/config.test.ts | 1 + backend/src/api/blocks.ts | 2 +- backend/src/api/disk-cache.ts | 8 ++------ backend/src/config.ts | 2 ++ docker/README.md | 2 ++ docker/backend/mempool-config.json | 3 ++- docker/backend/start.sh | 2 ++ production/mempool-config.liquid.json | 3 ++- production/mempool-config.liquidtestnet.json | 3 ++- production/mempool-config.mainnet.json | 3 ++- production/mempool-config.signet.json | 3 ++- production/mempool-config.testnet.json | 3 ++- 14 files changed, 26 insertions(+), 15 deletions(-) diff --git a/backend/mempool-config.sample.json b/backend/mempool-config.sample.json index 2369b64b5..d7ac621a3 100644 --- a/backend/mempool-config.sample.json +++ b/backend/mempool-config.sample.json @@ -27,7 +27,8 @@ "AUDIT": false, "ADVANCED_GBT_AUDIT": false, "ADVANCED_GBT_MEMPOOL": false, - "CPFP_INDEXING": false + "CPFP_INDEXING": false, + "DISK_CACHE_BLOCK_INTERVAL": 6 }, "CORE_RPC": { "HOST": "127.0.0.1", diff --git a/backend/src/__fixtures__/mempool-config.template.json b/backend/src/__fixtures__/mempool-config.template.json index 2bf52cbcf..07e930903 100644 --- a/backend/src/__fixtures__/mempool-config.template.json +++ b/backend/src/__fixtures__/mempool-config.template.json @@ -28,7 +28,8 @@ "ADVANCED_GBT_AUDIT": "__MEMPOOL_ADVANCED_GBT_AUDIT__", "ADVANCED_GBT_MEMPOOL": "__MEMPOOL_ADVANCED_GBT_MEMPOOL__", "CPFP_INDEXING": "__MEMPOOL_CPFP_INDEXING__", - "MAX_BLOCKS_BULK_QUERY": "__MEMPOOL_MAX_BLOCKS_BULK_QUERY__" + "MAX_BLOCKS_BULK_QUERY": "__MEMPOOL_MAX_BLOCKS_BULK_QUERY__", + "DISK_CACHE_BLOCK_INTERVAL": "__DISK_CACHE_BLOCK_INTERVAL__" }, "CORE_RPC": { "HOST": "__CORE_RPC_HOST__", diff --git a/backend/src/__tests__/config.test.ts b/backend/src/__tests__/config.test.ts index 8b7ebc9ce..fdffd593f 100644 --- a/backend/src/__tests__/config.test.ts +++ b/backend/src/__tests__/config.test.ts @@ -42,6 +42,7 @@ describe('Mempool Backend Config', () => { ADVANCED_GBT_MEMPOOL: false, CPFP_INDEXING: false, MAX_BLOCKS_BULK_QUERY: 0, + DISK_CACHE_BLOCK_INTERVAL: 6, }); expect(config.ELECTRUM).toStrictEqual({ HOST: '127.0.0.1', PORT: 3306, TLS_ENABLED: true }); diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts index 8ed81016b..f9b14d637 100644 --- a/backend/src/api/blocks.ts +++ b/backend/src/api/blocks.ts @@ -651,7 +651,7 @@ class Blocks { if (this.newBlockCallbacks.length) { this.newBlockCallbacks.forEach((cb) => cb(blockExtended, txIds, transactions)); } - if (!memPool.hasPriority() && (block.height % 6 === 0)) { + if (!memPool.hasPriority() && (block.height % config.MEMPOOL.DISK_CACHE_BLOCK_INTERVAL === 0)) { diskCache.$saveCacheToDisk(); } diff --git a/backend/src/api/disk-cache.ts b/backend/src/api/disk-cache.ts index 420d8e526..7180c6f51 100644 --- a/backend/src/api/disk-cache.ts +++ b/backend/src/api/disk-cache.ts @@ -19,16 +19,12 @@ class DiskCache { private isWritingCache = false; constructor() { - if (!cluster.isMaster) { + if (!cluster.isPrimary) { return; } process.on('SIGINT', (e) => { this.$saveCacheToDisk(true); - process.exit(2); - }); - process.on('SIGTERM', (e) => { - this.$saveCacheToDisk(true); - process.exit(2); + process.exit(0); }); } diff --git a/backend/src/config.ts b/backend/src/config.ts index 8ccd7e2e4..b364f100b 100644 --- a/backend/src/config.ts +++ b/backend/src/config.ts @@ -33,6 +33,7 @@ interface IConfig { ADVANCED_GBT_MEMPOOL: boolean; CPFP_INDEXING: boolean; MAX_BLOCKS_BULK_QUERY: number; + DISK_CACHE_BLOCK_INTERVAL: number; }; ESPLORA: { REST_API_URL: string; @@ -155,6 +156,7 @@ const defaults: IConfig = { 'ADVANCED_GBT_MEMPOOL': false, 'CPFP_INDEXING': false, 'MAX_BLOCKS_BULK_QUERY': 0, + 'DISK_CACHE_BLOCK_INTERVAL': 6, }, 'ESPLORA': { 'REST_API_URL': 'http://127.0.0.1:3000', diff --git a/docker/README.md b/docker/README.md index 525ecb718..13a4094cc 100644 --- a/docker/README.md +++ b/docker/README.md @@ -112,6 +112,7 @@ Below we list all settings from `mempool-config.json` and the corresponding over "ADVANCED_GBT_MEMPOOL": false, "CPFP_INDEXING": false, "MAX_BLOCKS_BULK_QUERY": 0, + "DISK_CACHE_BLOCK_INTERVAL": 6 }, ``` @@ -143,6 +144,7 @@ Corresponding `docker-compose.yml` overrides: MEMPOOL_ADVANCED_GBT_MEMPOOL: "" MEMPOOL_CPFP_INDEXING: "" MAX_BLOCKS_BULK_QUERY: "" + DISK_CACHE_BLOCK_INTERVAL: "" ... ``` diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json index 1b3ac1837..962a1509a 100644 --- a/docker/backend/mempool-config.json +++ b/docker/backend/mempool-config.json @@ -26,7 +26,8 @@ "ADVANCED_GBT_AUDIT": __MEMPOOL_ADVANCED_GBT_AUDIT__, "ADVANCED_GBT_MEMPOOL": __MEMPOOL_ADVANCED_GBT_MEMPOOL__, "CPFP_INDEXING": __MEMPOOL_CPFP_INDEXING__, - "MAX_BLOCKS_BULK_QUERY": __MEMPOOL_MAX_BLOCKS_BULK_QUERY__ + "MAX_BLOCKS_BULK_QUERY": __MEMPOOL_MAX_BLOCKS_BULK_QUERY__, + "DISK_CACHE_BLOCK_INTERVAL": __DISK_CACHE_BLOCK_INTERVAL__ }, "CORE_RPC": { "HOST": "__CORE_RPC_HOST__", diff --git a/docker/backend/start.sh b/docker/backend/start.sh index fced20974..cdf9ab67e 100755 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -30,6 +30,7 @@ __MEMPOOL_ADVANCED_GBT_AUDIT__=${MEMPOOL_ADVANCED_GBT_AUDIT:=false} __MEMPOOL_ADVANCED_GBT_MEMPOOL__=${MEMPOOL_ADVANCED_GBT_MEMPOOL:=false} __MEMPOOL_CPFP_INDEXING__=${MEMPOOL_CPFP_INDEXING:=false} __MEMPOOL_MAX_BLOCKS_BULK_QUERY__=${MEMPOOL_MAX_BLOCKS_BULK_QUERY:=0} +__MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__=${MEMPOOL_DISK_CACHE_BLOCK_INTERVAL:=6} # CORE_RPC __CORE_RPC_HOST__=${CORE_RPC_HOST:=127.0.0.1} @@ -149,6 +150,7 @@ sed -i "s!__MEMPOOL_ADVANCED_GBT_MEMPOOL__!${__MEMPOOL_ADVANCED_GBT_MEMPOOL__}!g sed -i "s!__MEMPOOL_ADVANCED_GBT_AUDIT__!${__MEMPOOL_ADVANCED_GBT_AUDIT__}!g" mempool-config.json sed -i "s!__MEMPOOL_CPFP_INDEXING__!${__MEMPOOL_CPFP_INDEXING__}!g" mempool-config.json sed -i "s!__MEMPOOL_MAX_BLOCKS_BULK_QUERY__!${__MEMPOOL_MAX_BLOCKS_BULK_QUERY__}!g" mempool-config.json +sed -i "s!__MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__!${__MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__}!g" mempool-config.json sed -i "s/__CORE_RPC_HOST__/${__CORE_RPC_HOST__}/g" mempool-config.json sed -i "s/__CORE_RPC_PORT__/${__CORE_RPC_PORT__}/g" mempool-config.json diff --git a/production/mempool-config.liquid.json b/production/mempool-config.liquid.json index 11ad8ffcd..d6513f9e2 100644 --- a/production/mempool-config.liquid.json +++ b/production/mempool-config.liquid.json @@ -6,7 +6,8 @@ "MINED_BLOCKS_CACHE": 144, "SPAWN_CLUSTER_PROCS": 0, "API_URL_PREFIX": "/api/v1/", - "POLL_RATE_MS": 1000 + "POLL_RATE_MS": 1000, + "DISK_CACHE_BLOCK_INTERVAL": 1 }, "SYSLOG" : { "MIN_PRIORITY": "debug" diff --git a/production/mempool-config.liquidtestnet.json b/production/mempool-config.liquidtestnet.json index 7769bfb53..f85f041d2 100644 --- a/production/mempool-config.liquidtestnet.json +++ b/production/mempool-config.liquidtestnet.json @@ -6,7 +6,8 @@ "MINED_BLOCKS_CACHE": 144, "SPAWN_CLUSTER_PROCS": 0, "API_URL_PREFIX": "/api/v1/", - "POLL_RATE_MS": 1000 + "POLL_RATE_MS": 1000, + "DISK_CACHE_BLOCK_INTERVAL": 1 }, "SYSLOG" : { "MIN_PRIORITY": "debug" diff --git a/production/mempool-config.mainnet.json b/production/mempool-config.mainnet.json index cca43d7e3..fc08ae930 100644 --- a/production/mempool-config.mainnet.json +++ b/production/mempool-config.mainnet.json @@ -14,7 +14,8 @@ "CPFP_INDEXING": true, "ADVANCED_GBT_AUDIT": true, "ADVANCED_GBT_MEMPOOL": true, - "USE_SECOND_NODE_FOR_MINFEE": true + "USE_SECOND_NODE_FOR_MINFEE": true, + "DISK_CACHE_BLOCK_INTERVAL": 1 }, "SYSLOG" : { "MIN_PRIORITY": "debug" diff --git a/production/mempool-config.signet.json b/production/mempool-config.signet.json index 87f8e2650..c4d43e040 100644 --- a/production/mempool-config.signet.json +++ b/production/mempool-config.signet.json @@ -10,7 +10,8 @@ "AUDIT": true, "ADVANCED_GBT_AUDIT": true, "ADVANCED_GBT_MEMPOOL": true, - "POLL_RATE_MS": 1000 + "POLL_RATE_MS": 1000, + "DISK_CACHE_BLOCK_INTERVAL": 1 }, "SYSLOG" : { "MIN_PRIORITY": "debug" diff --git a/production/mempool-config.testnet.json b/production/mempool-config.testnet.json index 5c1695e62..f5ff4fba1 100644 --- a/production/mempool-config.testnet.json +++ b/production/mempool-config.testnet.json @@ -10,7 +10,8 @@ "AUDIT": true, "ADVANCED_GBT_AUDIT": true, "ADVANCED_GBT_MEMPOOL": true, - "POLL_RATE_MS": 1000 + "POLL_RATE_MS": 1000, + "DISK_CACHE_BLOCK_INTERVAL": 1 }, "SYSLOG" : { "MIN_PRIORITY": "debug" From 870e89514441fde18e9631801ce14b8dc29a3436 Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 20 Mar 2023 16:11:37 +0900 Subject: [PATCH 53/60] Correcting docker disk cache config variable --- backend/src/__fixtures__/mempool-config.template.json | 2 +- docker/backend/mempool-config.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/__fixtures__/mempool-config.template.json b/backend/src/__fixtures__/mempool-config.template.json index 07e930903..0ad2bc10d 100644 --- a/backend/src/__fixtures__/mempool-config.template.json +++ b/backend/src/__fixtures__/mempool-config.template.json @@ -29,7 +29,7 @@ "ADVANCED_GBT_MEMPOOL": "__MEMPOOL_ADVANCED_GBT_MEMPOOL__", "CPFP_INDEXING": "__MEMPOOL_CPFP_INDEXING__", "MAX_BLOCKS_BULK_QUERY": "__MEMPOOL_MAX_BLOCKS_BULK_QUERY__", - "DISK_CACHE_BLOCK_INTERVAL": "__DISK_CACHE_BLOCK_INTERVAL__" + "DISK_CACHE_BLOCK_INTERVAL": "__MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__" }, "CORE_RPC": { "HOST": "__CORE_RPC_HOST__", diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json index 962a1509a..6e20cc695 100644 --- a/docker/backend/mempool-config.json +++ b/docker/backend/mempool-config.json @@ -27,7 +27,7 @@ "ADVANCED_GBT_MEMPOOL": __MEMPOOL_ADVANCED_GBT_MEMPOOL__, "CPFP_INDEXING": __MEMPOOL_CPFP_INDEXING__, "MAX_BLOCKS_BULK_QUERY": __MEMPOOL_MAX_BLOCKS_BULK_QUERY__, - "DISK_CACHE_BLOCK_INTERVAL": __DISK_CACHE_BLOCK_INTERVAL__ + "DISK_CACHE_BLOCK_INTERVAL": __MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__ }, "CORE_RPC": { "HOST": "__CORE_RPC_HOST__", From 81d563381a26a5134989bfe623a4218246a53bab Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Mon, 20 Mar 2023 16:15:40 +0900 Subject: [PATCH 54/60] Make bitcoin core timeout configurable --- backend/mempool-config.sample.json | 6 ++++-- backend/src/__fixtures__/mempool-config.template.json | 6 ++++-- backend/src/__tests__/config.test.ts | 6 ++++-- backend/src/api/bitcoin/bitcoin-client.ts | 2 +- backend/src/api/bitcoin/bitcoin-second-client.ts | 2 +- backend/src/config.ts | 8 ++++++-- docker/README.md | 9 +++++++-- docker/backend/mempool-config.json | 6 ++++-- docker/backend/start.sh | 4 ++++ 9 files changed, 35 insertions(+), 14 deletions(-) diff --git a/backend/mempool-config.sample.json b/backend/mempool-config.sample.json index 2369b64b5..a1391c52b 100644 --- a/backend/mempool-config.sample.json +++ b/backend/mempool-config.sample.json @@ -33,7 +33,8 @@ "HOST": "127.0.0.1", "PORT": 8332, "USERNAME": "mempool", - "PASSWORD": "mempool" + "PASSWORD": "mempool", + "TIMEOUT": 60000 }, "ELECTRUM": { "HOST": "127.0.0.1", @@ -47,7 +48,8 @@ "HOST": "127.0.0.1", "PORT": 8332, "USERNAME": "mempool", - "PASSWORD": "mempool" + "PASSWORD": "mempool", + "TIMEOUT": 60000 }, "DATABASE": { "ENABLED": true, diff --git a/backend/src/__fixtures__/mempool-config.template.json b/backend/src/__fixtures__/mempool-config.template.json index 2bf52cbcf..759781045 100644 --- a/backend/src/__fixtures__/mempool-config.template.json +++ b/backend/src/__fixtures__/mempool-config.template.json @@ -34,7 +34,8 @@ "HOST": "__CORE_RPC_HOST__", "PORT": 15, "USERNAME": "__CORE_RPC_USERNAME__", - "PASSWORD": "__CORE_RPC_PASSWORD__" + "PASSWORD": "__CORE_RPC_PASSWORD__", + "TIMEOUT": "__CORE_RPC_TIMEOUT__" }, "ELECTRUM": { "HOST": "__ELECTRUM_HOST__", @@ -48,7 +49,8 @@ "HOST": "__SECOND_CORE_RPC_HOST__", "PORT": 17, "USERNAME": "__SECOND_CORE_RPC_USERNAME__", - "PASSWORD": "__SECOND_CORE_RPC_PASSWORD__" + "PASSWORD": "__SECOND_CORE_RPC_PASSWORD__", + "TIMEOUT": "__SECOND_CORE_RPC_TIMEOUT__" }, "DATABASE": { "ENABLED": false, diff --git a/backend/src/__tests__/config.test.ts b/backend/src/__tests__/config.test.ts index 8b7ebc9ce..04c97f961 100644 --- a/backend/src/__tests__/config.test.ts +++ b/backend/src/__tests__/config.test.ts @@ -52,14 +52,16 @@ describe('Mempool Backend Config', () => { HOST: '127.0.0.1', PORT: 8332, USERNAME: 'mempool', - PASSWORD: 'mempool' + PASSWORD: 'mempool', + TIMEOUT: 60000 }); expect(config.SECOND_CORE_RPC).toStrictEqual({ HOST: '127.0.0.1', PORT: 8332, USERNAME: 'mempool', - PASSWORD: 'mempool' + PASSWORD: 'mempool', + TIMEOUT: 60000 }); expect(config.DATABASE).toStrictEqual({ diff --git a/backend/src/api/bitcoin/bitcoin-client.ts b/backend/src/api/bitcoin/bitcoin-client.ts index 85a410496..429638984 100644 --- a/backend/src/api/bitcoin/bitcoin-client.ts +++ b/backend/src/api/bitcoin/bitcoin-client.ts @@ -7,7 +7,7 @@ const nodeRpcCredentials: BitcoinRpcCredentials = { port: config.CORE_RPC.PORT, user: config.CORE_RPC.USERNAME, pass: config.CORE_RPC.PASSWORD, - timeout: 60000, + timeout: config.CORE_RPC.TIMEOUT, }; export default new bitcoin.Client(nodeRpcCredentials); diff --git a/backend/src/api/bitcoin/bitcoin-second-client.ts b/backend/src/api/bitcoin/bitcoin-second-client.ts index 39633a317..7f81a96a0 100644 --- a/backend/src/api/bitcoin/bitcoin-second-client.ts +++ b/backend/src/api/bitcoin/bitcoin-second-client.ts @@ -7,7 +7,7 @@ const nodeRpcCredentials: BitcoinRpcCredentials = { port: config.SECOND_CORE_RPC.PORT, user: config.SECOND_CORE_RPC.USERNAME, pass: config.SECOND_CORE_RPC.PASSWORD, - timeout: 60000, + timeout: config.SECOND_CORE_RPC.TIMEOUT, }; export default new bitcoin.Client(nodeRpcCredentials); diff --git a/backend/src/config.ts b/backend/src/config.ts index 8ccd7e2e4..6c17d7f81 100644 --- a/backend/src/config.ts +++ b/backend/src/config.ts @@ -65,12 +65,14 @@ interface IConfig { PORT: number; USERNAME: string; PASSWORD: string; + TIMEOUT: number; }; SECOND_CORE_RPC: { HOST: string; PORT: number; USERNAME: string; PASSWORD: string; + TIMEOUT: number; }; DATABASE: { ENABLED: boolean; @@ -168,13 +170,15 @@ const defaults: IConfig = { 'HOST': '127.0.0.1', 'PORT': 8332, 'USERNAME': 'mempool', - 'PASSWORD': 'mempool' + 'PASSWORD': 'mempool', + 'TIMEOUT': 60000, }, 'SECOND_CORE_RPC': { 'HOST': '127.0.0.1', 'PORT': 8332, 'USERNAME': 'mempool', - 'PASSWORD': 'mempool' + 'PASSWORD': 'mempool', + 'TIMEOUT': 60000, }, 'DATABASE': { 'ENABLED': true, diff --git a/docker/README.md b/docker/README.md index 525ecb718..ea9ca5d51 100644 --- a/docker/README.md +++ b/docker/README.md @@ -34,6 +34,7 @@ If you want to use different credentials, specify them in the `docker-compose.ym CORE_RPC_PORT: "8332" CORE_RPC_USERNAME: "customuser" CORE_RPC_PASSWORD: "custompassword" + CORE_RPC_TIMEOUT: "60000" ``` The IP address in the example above refers to Docker's default gateway IP address so that the container can hit the `bitcoind` instance running on the host machine. If your setup is different, update it accordingly. @@ -158,7 +159,8 @@ Corresponding `docker-compose.yml` overrides: "HOST": "127.0.0.1", "PORT": 8332, "USERNAME": "mempool", - "PASSWORD": "mempool" + "PASSWORD": "mempool", + "TIMEOUT": 60000 }, ``` @@ -170,6 +172,7 @@ Corresponding `docker-compose.yml` overrides: CORE_RPC_PORT: "" CORE_RPC_USERNAME: "" CORE_RPC_PASSWORD: "" + CORE_RPC_TIMEOUT: "" ... ``` @@ -219,7 +222,8 @@ Corresponding `docker-compose.yml` overrides: "HOST": "127.0.0.1", "PORT": 8332, "USERNAME": "mempool", - "PASSWORD": "mempool" + "PASSWORD": "mempool", + "TIMEOUT": 60000 }, ``` @@ -231,6 +235,7 @@ Corresponding `docker-compose.yml` overrides: SECOND_CORE_RPC_PORT: "" SECOND_CORE_RPC_USERNAME: "" SECOND_CORE_RPC_PASSWORD: "" + SECOND_CORE_RPC_TIMEOUT: "" ... ``` diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json index 1b3ac1837..915f0aac3 100644 --- a/docker/backend/mempool-config.json +++ b/docker/backend/mempool-config.json @@ -32,7 +32,8 @@ "HOST": "__CORE_RPC_HOST__", "PORT": __CORE_RPC_PORT__, "USERNAME": "__CORE_RPC_USERNAME__", - "PASSWORD": "__CORE_RPC_PASSWORD__" + "PASSWORD": "__CORE_RPC_PASSWORD__", + "TIMEOUT": __CORE_RPC_TIMEOUT__ }, "ELECTRUM": { "HOST": "__ELECTRUM_HOST__", @@ -46,7 +47,8 @@ "HOST": "__SECOND_CORE_RPC_HOST__", "PORT": __SECOND_CORE_RPC_PORT__, "USERNAME": "__SECOND_CORE_RPC_USERNAME__", - "PASSWORD": "__SECOND_CORE_RPC_PASSWORD__" + "PASSWORD": "__SECOND_CORE_RPC_PASSWORD__", + "TIMEOUT": __SECOND_CORE_RPC_TIMEOUT__ }, "DATABASE": { "ENABLED": __DATABASE_ENABLED__, diff --git a/docker/backend/start.sh b/docker/backend/start.sh index fced20974..f307b7111 100755 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -36,6 +36,7 @@ __CORE_RPC_HOST__=${CORE_RPC_HOST:=127.0.0.1} __CORE_RPC_PORT__=${CORE_RPC_PORT:=8332} __CORE_RPC_USERNAME__=${CORE_RPC_USERNAME:=mempool} __CORE_RPC_PASSWORD__=${CORE_RPC_PASSWORD:=mempool} +__CORE_RPC_TIMEOUT__=${CORE_RPC_TIMEOUT:=60000} # ELECTRUM __ELECTRUM_HOST__=${ELECTRUM_HOST:=127.0.0.1} @@ -50,6 +51,7 @@ __SECOND_CORE_RPC_HOST__=${SECOND_CORE_RPC_HOST:=127.0.0.1} __SECOND_CORE_RPC_PORT__=${SECOND_CORE_RPC_PORT:=8332} __SECOND_CORE_RPC_USERNAME__=${SECOND_CORE_RPC_USERNAME:=mempool} __SECOND_CORE_RPC_PASSWORD__=${SECOND_CORE_RPC_PASSWORD:=mempool} +__SECOND_CORE_RPC_TIMEOUT__=${SECOND_CORE_RPC_TIMEOUT:=60000} # DATABASE __DATABASE_ENABLED__=${DATABASE_ENABLED:=true} @@ -154,6 +156,7 @@ sed -i "s/__CORE_RPC_HOST__/${__CORE_RPC_HOST__}/g" mempool-config.json sed -i "s/__CORE_RPC_PORT__/${__CORE_RPC_PORT__}/g" mempool-config.json sed -i "s/__CORE_RPC_USERNAME__/${__CORE_RPC_USERNAME__}/g" mempool-config.json sed -i "s/__CORE_RPC_PASSWORD__/${__CORE_RPC_PASSWORD__}/g" mempool-config.json +sed -i "s/__CORE_RPC_TIMEOUT__/${__CORE_RPC_TIMEOUT__}/g" mempool-config.json sed -i "s/__ELECTRUM_HOST__/${__ELECTRUM_HOST__}/g" mempool-config.json sed -i "s/__ELECTRUM_PORT__/${__ELECTRUM_PORT__}/g" mempool-config.json @@ -165,6 +168,7 @@ sed -i "s/__SECOND_CORE_RPC_HOST__/${__SECOND_CORE_RPC_HOST__}/g" mempool-config sed -i "s/__SECOND_CORE_RPC_PORT__/${__SECOND_CORE_RPC_PORT__}/g" mempool-config.json sed -i "s/__SECOND_CORE_RPC_USERNAME__/${__SECOND_CORE_RPC_USERNAME__}/g" mempool-config.json sed -i "s/__SECOND_CORE_RPC_PASSWORD__/${__SECOND_CORE_RPC_PASSWORD__}/g" mempool-config.json +sed -i "s/__SECOND_CORE_RPC_TIMEOUT__/${__SECOND_CORE_RPC_TIMEOUT__}/g" mempool-config.json sed -i "s/__DATABASE_ENABLED__/${__DATABASE_ENABLED__}/g" mempool-config.json sed -i "s/__DATABASE_HOST__/${__DATABASE_HOST__}/g" mempool-config.json From c6e063ea2f58428b3d12c4496c12052a3d32de49 Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Mon, 20 Mar 2023 16:35:44 +0900 Subject: [PATCH 55/60] Make lnd timeout configurable --- backend/mempool-config.sample.json | 3 ++- backend/src/__fixtures__/mempool-config.template.json | 3 ++- backend/src/api/lightning/lnd/lnd-api.ts | 2 +- backend/src/config.ts | 2 ++ docker/README.md | 4 +++- docker/backend/mempool-config.json | 3 ++- docker/backend/start.sh | 2 ++ 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/backend/mempool-config.sample.json b/backend/mempool-config.sample.json index a1391c52b..9e941636e 100644 --- a/backend/mempool-config.sample.json +++ b/backend/mempool-config.sample.json @@ -93,7 +93,8 @@ "LND": { "TLS_CERT_PATH": "tls.cert", "MACAROON_PATH": "readonly.macaroon", - "REST_API_URL": "https://localhost:8080" + "REST_API_URL": "https://localhost:8080", + "TIMEOUT": 10000 }, "CLIGHTNING": { "SOCKET": "lightning-rpc" diff --git a/backend/src/__fixtures__/mempool-config.template.json b/backend/src/__fixtures__/mempool-config.template.json index 759781045..239c30547 100644 --- a/backend/src/__fixtures__/mempool-config.template.json +++ b/backend/src/__fixtures__/mempool-config.template.json @@ -109,7 +109,8 @@ "LND": { "TLS_CERT_PATH": "", "MACAROON_PATH": "", - "REST_API_URL": "https://localhost:8080" + "REST_API_URL": "https://localhost:8080", + "TIMEOUT": 10000 }, "CLIGHTNING": { "SOCKET": "__CLIGHTNING_SOCKET__" diff --git a/backend/src/api/lightning/lnd/lnd-api.ts b/backend/src/api/lightning/lnd/lnd-api.ts index 1480f9b8f..31b868df9 100644 --- a/backend/src/api/lightning/lnd/lnd-api.ts +++ b/backend/src/api/lightning/lnd/lnd-api.ts @@ -17,7 +17,7 @@ class LndApi implements AbstractLightningApi { httpsAgent: new Agent({ ca: fs.readFileSync(config.LND.TLS_CERT_PATH) }), - timeout: 10000 + timeout: config.LND.TIMEOUT }; } } diff --git a/backend/src/config.ts b/backend/src/config.ts index 6c17d7f81..a16b38af9 100644 --- a/backend/src/config.ts +++ b/backend/src/config.ts @@ -51,6 +51,7 @@ interface IConfig { TLS_CERT_PATH: string; MACAROON_PATH: string; REST_API_URL: string; + TIMEOUT: number; }; CLIGHTNING: { SOCKET: string; @@ -218,6 +219,7 @@ const defaults: IConfig = { 'TLS_CERT_PATH': '', 'MACAROON_PATH': '', 'REST_API_URL': 'https://localhost:8080', + 'TIMEOUT': 10000, }, 'CLIGHTNING': { 'SOCKET': '', diff --git a/docker/README.md b/docker/README.md index ea9ca5d51..1b9787842 100644 --- a/docker/README.md +++ b/docker/README.md @@ -172,7 +172,7 @@ Corresponding `docker-compose.yml` overrides: CORE_RPC_PORT: "" CORE_RPC_USERNAME: "" CORE_RPC_PASSWORD: "" - CORE_RPC_TIMEOUT: "" + CORE_RPC_TIMEOUT: 60000 ... ``` @@ -408,6 +408,7 @@ Corresponding `docker-compose.yml` overrides: "TLS_CERT_PATH": "" "MACAROON_PATH": "" "REST_API_URL": "https://localhost:8080" + "TIMEOUT": 10000 } ``` @@ -418,6 +419,7 @@ Corresponding `docker-compose.yml` overrides: LND_TLS_CERT_PATH: "" LND_MACAROON_PATH: "" LND_REST_API_URL: "https://localhost:8080" + LND_TIMEOUT: 10000 ... ``` diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json index 915f0aac3..c1165a93a 100644 --- a/docker/backend/mempool-config.json +++ b/docker/backend/mempool-config.json @@ -85,7 +85,8 @@ "LND": { "TLS_CERT_PATH": "__LND_TLS_CERT_PATH__", "MACAROON_PATH": "__LND_MACAROON_PATH__", - "REST_API_URL": "__LND_REST_API_URL__" + "REST_API_URL": "__LND_REST_API_URL__", + "TIMEOUT": "__LND_TIMEOUT__" }, "CLIGHTNING": { "SOCKET": "__CLIGHTNING_SOCKET__" diff --git a/docker/backend/start.sh b/docker/backend/start.sh index f307b7111..3c963815c 100755 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -109,6 +109,7 @@ __LIGHTNING_LOGGER_UPDATE_INTERVAL__=${LIGHTNING_LOGGER_UPDATE_INTERVAL:=30} __LND_TLS_CERT_PATH__=${LND_TLS_CERT_PATH:=""} __LND_MACAROON_PATH__=${LND_MACAROON_PATH:=""} __LND_REST_API_URL__=${LND_REST_API_URL:="https://localhost:8080"} +__LND_TIMEOUT__=${LND_TIMEOUT:=10000} # CLN __CLIGHTNING_SOCKET__=${CLIGHTNING_SOCKET:=""} @@ -220,6 +221,7 @@ sed -i "s!__LIGHTNING_LOGGER_UPDATE_INTERVAL__!${__LIGHTNING_LOGGER_UPDATE_INTER sed -i "s!__LND_TLS_CERT_PATH__!${__LND_TLS_CERT_PATH__}!g" mempool-config.json sed -i "s!__LND_MACAROON_PATH__!${__LND_MACAROON_PATH__}!g" mempool-config.json sed -i "s!__LND_REST_API_URL__!${__LND_REST_API_URL__}!g" mempool-config.json +sed -i "s!__LND_TIMEOUT__!${__LND_TIMEOUT__}!g" mempool-config.json # CLN sed -i "s!__CLIGHTNING_SOCKET__!${__CLIGHTNING_SOCKET__}!g" mempool-config.json From 74fb2926330dcf344ef107b91d169f04f8ef1d22 Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 20 Mar 2023 17:21:34 +0900 Subject: [PATCH 56/60] Difficulty mining ellipsis fix --- .../difficulty-mining/difficulty-mining.component.html | 5 +++-- .../difficulty-mining/difficulty-mining.component.scss | 4 ++++ .../difficulty-mining/difficulty-mining.component.ts | 4 ++++ .../app/components/reward-stats/reward-stats.component.html | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/components/difficulty-mining/difficulty-mining.component.html b/frontend/src/app/components/difficulty-mining/difficulty-mining.component.html index ce0bf7eff..774ddef07 100644 --- a/frontend/src/app/components/difficulty-mining/difficulty-mining.component.html +++ b/frontend/src/app/components/difficulty-mining/difficulty-mining.component.html @@ -47,7 +47,8 @@
-
Next Halving
+
Next Halving
{{ i }} blocks @@ -77,7 +78,7 @@
-
Current Period
+
Next Halving
diff --git a/frontend/src/app/components/difficulty-mining/difficulty-mining.component.scss b/frontend/src/app/components/difficulty-mining/difficulty-mining.component.scss index 0530bc0cf..cf031bebc 100644 --- a/frontend/src/app/components/difficulty-mining/difficulty-mining.component.scss +++ b/frontend/src/app/components/difficulty-mining/difficulty-mining.component.scss @@ -10,6 +10,7 @@ .item { padding: 0 5px; width: 100%; + max-width: 150px; &:nth-child(1) { display: none; @media (min-width: 485px) { @@ -85,6 +86,9 @@ .card-title { color: #4a68b9; font-size: 1rem; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .progress { diff --git a/frontend/src/app/components/difficulty-mining/difficulty-mining.component.ts b/frontend/src/app/components/difficulty-mining/difficulty-mining.component.ts index 2abb02e22..fbf31f238 100644 --- a/frontend/src/app/components/difficulty-mining/difficulty-mining.component.ts +++ b/frontend/src/app/components/difficulty-mining/difficulty-mining.component.ts @@ -83,4 +83,8 @@ export class DifficultyMiningComponent implements OnInit { }) ); } + + isEllipsisActive(e): boolean { + return (e.offsetWidth < e.scrollWidth); + } } diff --git a/frontend/src/app/components/reward-stats/reward-stats.component.html b/frontend/src/app/components/reward-stats/reward-stats.component.html index d59280fd1..5c1a8d7cd 100644 --- a/frontend/src/app/components/reward-stats/reward-stats.component.html +++ b/frontend/src/app/components/reward-stats/reward-stats.component.html @@ -50,14 +50,14 @@
-
Reward Per Tx
+
Avg Block Fees
-
Reward Per Tx
+
Avg Tx Fee
From d82a7169b779e38f99232bb78bd585964b6cff1c Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 20 Mar 2023 18:28:15 +0900 Subject: [PATCH 57/60] Pull from transifex --- frontend/src/locale/messages.de.xlf | 13 +++++--- frontend/src/locale/messages.pt.xlf | 3 ++ frontend/src/locale/messages.ru.xlf | 48 ++++++++++++++++++++--------- 3 files changed, 44 insertions(+), 20 deletions(-) diff --git a/frontend/src/locale/messages.de.xlf b/frontend/src/locale/messages.de.xlf index a78568ca1..87050f55b 100644 --- a/frontend/src/locale/messages.de.xlf +++ b/frontend/src/locale/messages.de.xlf @@ -3203,7 +3203,7 @@ blocks expected - Blöcke erwartet + Blöcke erwartet src/app/components/difficulty/difficulty-tooltip.component.html 13 @@ -3221,7 +3221,7 @@ blocks mined - Blöcke gefunden + Blöcke gefunden src/app/components/difficulty/difficulty-tooltip.component.html 18 @@ -3239,7 +3239,7 @@ blocks remaining - verbleibende Blöcke + verbleibende Blöcke src/app/components/difficulty/difficulty-tooltip.component.html 24 @@ -3257,7 +3257,7 @@ blocks ahead - Blöcke voraus + Blöcke voraus src/app/components/difficulty/difficulty-tooltip.component.html 29 @@ -3275,7 +3275,7 @@ blocks behind - Blöcke dahinter + Blöcke dahinter src/app/components/difficulty/difficulty-tooltip.component.html 34 @@ -3995,6 +3995,7 @@ blocks + blöcke src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -4014,6 +4015,7 @@ Other () + Andere () src/app/components/pool-ranking/pool-ranking.component.ts 201 @@ -6773,6 +6775,7 @@ nodes + nodes src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts 104,103 diff --git a/frontend/src/locale/messages.pt.xlf b/frontend/src/locale/messages.pt.xlf index e6ef0f346..bed923e05 100644 --- a/frontend/src/locale/messages.pt.xlf +++ b/frontend/src/locale/messages.pt.xlf @@ -3995,6 +3995,7 @@ blocks + blocos src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -4014,6 +4015,7 @@ Other () + Outras () src/app/components/pool-ranking/pool-ranking.component.ts 201 @@ -6773,6 +6775,7 @@ nodes + nós src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts 104,103 diff --git a/frontend/src/locale/messages.ru.xlf b/frontend/src/locale/messages.ru.xlf index ef455e2a5..db7f70492 100644 --- a/frontend/src/locale/messages.ru.xlf +++ b/frontend/src/locale/messages.ru.xlf @@ -348,7 +348,7 @@ transaction - транзакция + транзакция src/app/bisq/bisq-address/bisq-address.component.html 48 @@ -373,7 +373,7 @@ transactions - транзакции(й) + транзакции(й) src/app/bisq/bisq-address/bisq-address.component.html 49 @@ -1109,7 +1109,7 @@ confirmation - подтверждение + подтверждение src/app/bisq/bisq-transaction/bisq-transaction.component.html 20,21 @@ -1131,7 +1131,7 @@ confirmations - подтверждения(й) + подтверждения(й) src/app/bisq/bisq-transaction/bisq-transaction.component.html 21,22 @@ -1764,7 +1764,7 @@ of   - из + из src/app/components/asset/asset.component.html 78 @@ -3203,6 +3203,7 @@ blocks expected + блоков добавлено src/app/components/difficulty/difficulty-tooltip.component.html 13 @@ -3211,6 +3212,7 @@ block expected + блок добавлен src/app/components/difficulty/difficulty-tooltip.component.html 14 @@ -3219,6 +3221,7 @@ blocks mined + блоков намайнено src/app/components/difficulty/difficulty-tooltip.component.html 18 @@ -3227,6 +3230,7 @@ block mined + блок намайнен src/app/components/difficulty/difficulty-tooltip.component.html 19 @@ -3235,6 +3239,7 @@ blocks remaining + блоков осталось src/app/components/difficulty/difficulty-tooltip.component.html 24 @@ -3243,6 +3248,7 @@ block remaining + блок остался src/app/components/difficulty/difficulty-tooltip.component.html 25 @@ -3251,6 +3257,7 @@ blocks ahead + блоков ожидает src/app/components/difficulty/difficulty-tooltip.component.html 29 @@ -3259,6 +3266,7 @@ block ahead + блок ожидает src/app/components/difficulty/difficulty-tooltip.component.html 30 @@ -3267,6 +3275,7 @@ blocks behind + блоков позади src/app/components/difficulty/difficulty-tooltip.component.html 34 @@ -3275,6 +3284,7 @@ block behind + блок позади src/app/components/difficulty/difficulty-tooltip.component.html 35 @@ -3283,6 +3293,7 @@ Average block time + Среднее время блока src/app/components/difficulty/difficulty.component.html 42,45 @@ -3984,6 +3995,7 @@ blocks + блоков src/app/components/pool-ranking/pool-ranking.component.ts 165,163 @@ -4003,6 +4015,7 @@ Other () + Другое ( ) src/app/components/pool-ranking/pool-ranking.component.ts 201 @@ -4505,7 +4518,7 @@ ago - назад + назад src/app/components/time/time.component.ts 103 @@ -4565,6 +4578,7 @@ In ~ + Через ~ src/app/components/time/time.component.ts 126 @@ -5053,7 +5067,7 @@ remaining - осталось + осталось src/app/components/transactions-list/transactions-list.component.html 332,333 @@ -5106,7 +5120,7 @@ This transaction saved % on fees by using native SegWit - Эта транзакция сэкономила % на комиссиях за счет использования нативного SegWit. + Эта транзакция сэкономила % на комиссиях за счет использования нативного SegWit. src/app/components/tx-features/tx-features.component.html 2 @@ -5133,7 +5147,7 @@ This transaction saved % on fees by using SegWit and could save % more by fully upgrading to native SegWit - Эта транзакция сэкономила % на комиссиях за счет использования SegWit и может сэкономить еще % за счет полного перехода на нативный SegWit. + Эта транзакция сэкономила % на комиссиях за счет использования SegWit и может сэкономить еще % за счет полного перехода на нативный SegWit. src/app/components/tx-features/tx-features.component.html 4 @@ -5142,7 +5156,7 @@ This transaction could save % on fees by upgrading to native SegWit or % by upgrading to SegWit-P2SH - Эта транзакция могла сэкономить % на комиссиях за счет перехода на нативный SegWit или % за счет обновления до SegWit-P2SH. + Эта транзакция могла сэкономить % на комиссиях за счет перехода на нативный SegWit или % за счет обновления до SegWit-P2SH. src/app/components/tx-features/tx-features.component.html 6 @@ -5264,7 +5278,7 @@ Only ~ sat/vB was needed to get into this block - Чтобы попасть в этот блок, необходимо всего ~ sat / vB + Чтобы попасть в этот блок, необходимо всего ~ sat/vB src/app/components/tx-fee-rating/tx-fee-rating.component.html 2 @@ -5277,7 +5291,7 @@ Overpaid x - Переплачено x + Переплачено x src/app/components/tx-fee-rating/tx-fee-rating.component.html 2 @@ -5564,7 +5578,7 @@ channels - каналов + каналов src/app/lightning/channel/channel-box/channel-box.component.html 79 @@ -6712,6 +6726,7 @@ Clearnet and Darknet + Clearnet и Darknet src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 164,161 @@ -6723,6 +6738,7 @@ Clearnet Only (IPv4, IPv6) + Только Clearnet (IPv4, IPv6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 185,182 @@ -6734,6 +6750,7 @@ Darknet Only (Tor, I2P, cjdns) + Только Darknet (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts 206,203 @@ -6758,6 +6775,7 @@ nodes + узлов src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts 104,103 @@ -7100,7 +7118,7 @@ minute - минута + минута src/app/shared/i18n/dates.ts 13 @@ -7108,7 +7126,7 @@ minutes - минут + минут src/app/shared/i18n/dates.ts 14 From e6bc5bef3349de4dc944e8ae77e7879841e11e0c Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 20 Mar 2023 18:50:20 +0900 Subject: [PATCH 58/60] Updating russian i18n --- frontend/src/locale/messages.ru.xlf | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/src/locale/messages.ru.xlf b/frontend/src/locale/messages.ru.xlf index db7f70492..3ecb4798f 100644 --- a/frontend/src/locale/messages.ru.xlf +++ b/frontend/src/locale/messages.ru.xlf @@ -7038,7 +7038,7 @@ year - год + год src/app/shared/i18n/dates.ts 3 @@ -7046,7 +7046,7 @@ years - лет + лет src/app/shared/i18n/dates.ts 4 @@ -7054,7 +7054,7 @@ month - месяц + месяц src/app/shared/i18n/dates.ts 5 @@ -7062,7 +7062,7 @@ months - месяцев + месяцев src/app/shared/i18n/dates.ts 6 @@ -7070,7 +7070,7 @@ week - неделя + неделя src/app/shared/i18n/dates.ts 7 @@ -7078,7 +7078,7 @@ weeks - недель + недель src/app/shared/i18n/dates.ts 8 @@ -7086,7 +7086,7 @@ day - дней + дней src/app/shared/i18n/dates.ts 9 @@ -7094,7 +7094,7 @@ days - дней + дней src/app/shared/i18n/dates.ts 10 @@ -7102,7 +7102,7 @@ hour - час + час src/app/shared/i18n/dates.ts 11 @@ -7110,7 +7110,7 @@ hours - часов + часов src/app/shared/i18n/dates.ts 12 @@ -7134,7 +7134,7 @@ second - секунда + секунда src/app/shared/i18n/dates.ts 15 @@ -7142,7 +7142,7 @@ seconds - секунд + секунд src/app/shared/i18n/dates.ts 16 From e3109a8fec0b92f6996f02b2b3da72c82edd8dfb Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 20 Mar 2023 20:46:11 +0900 Subject: [PATCH 59/60] Catch exeptions in Lightning stats fixes #3486 --- backend/src/index.ts | 4 ++-- .../src/tasks/lightning/stats-updater.service.ts | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/backend/src/index.ts b/backend/src/index.ts index fbe9c08c2..ccba83be9 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -215,11 +215,11 @@ class Server { await lightningStatsUpdater.$startService(); await forensicsService.$startService(); } catch(e) { - logger.err(`Nodejs lightning backend crashed. Restarting in 1 minute. Reason: ${(e instanceof Error ? e.message : e)}`); + logger.err(`Exception in $runLightningBackend. Restarting in 1 minute. Reason: ${(e instanceof Error ? e.message : e)}`); await Common.sleep$(1000 * 60); this.$runLightningBackend(); }; -} + } setUpWebsocketHandling(): void { if (this.wss) { diff --git a/backend/src/tasks/lightning/stats-updater.service.ts b/backend/src/tasks/lightning/stats-updater.service.ts index 69b4cbadd..5d0ac3cfc 100644 --- a/backend/src/tasks/lightning/stats-updater.service.ts +++ b/backend/src/tasks/lightning/stats-updater.service.ts @@ -22,12 +22,15 @@ class LightningStatsUpdater { * Update the latest entry for each node every config.LIGHTNING.STATS_REFRESH_INTERVAL seconds */ private async $logStatsDaily(): Promise { - const date = new Date(); - Common.setDateMidnight(date); - const networkGraph = await lightningApi.$getNetworkGraph(); - await LightningStatsImporter.computeNetworkStats(date.getTime() / 1000, networkGraph); - - logger.debug(`Updated latest network stats`, logger.tags.ln); + try { + const date = new Date(); + Common.setDateMidnight(date); + const networkGraph = await lightningApi.$getNetworkGraph(); + await LightningStatsImporter.computeNetworkStats(date.getTime() / 1000, networkGraph); + logger.debug(`Updated latest network stats`, logger.tags.ln); + } catch (e) { + logger.err(`Exception in $logStatsDaily. Reason: ${(e instanceof Error ? e.message : e)}`); + } } } From cd2bda4b493c34ba1b63a443a63215391db29d39 Mon Sep 17 00:00:00 2001 From: softsimon Date: Mon, 20 Mar 2023 21:44:47 +0900 Subject: [PATCH 60/60] Pull russian from transifex --- frontend/src/locale/messages.ru.xlf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locale/messages.ru.xlf b/frontend/src/locale/messages.ru.xlf index 3ecb4798f..490b42bd9 100644 --- a/frontend/src/locale/messages.ru.xlf +++ b/frontend/src/locale/messages.ru.xlf @@ -7070,7 +7070,7 @@ week - неделя + неделю src/app/shared/i18n/dates.ts 7 @@ -7078,7 +7078,7 @@ weeks - недель + недели src/app/shared/i18n/dates.ts 8
HeightAdjustedDifficultyChangeHeightAdjustedDifficultyChange
{{ diffChange.height - }} + + {{ diffChange.height }} + {{ diffChange.difficultyShorten }}