machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into nymkappa/bugfix/wipe-cache-reindexing

Browse Source
This commit is contained in:
softsimon 2023-03-03 11:09:31 +09:00 committed by GitHub
commit c404895b1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
85 changed files with 7813 additions and 3783 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -9,7 +9,7 @@ jobs:
if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')" if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
strategy: strategy:
matrix: matrix:
node: ["16.16.0", "18.14.1", "19.6.1"] node: ["16.16.0", "18.14.1"]
flavor: ["dev", "prod"] flavor: ["dev", "prod"]
fail-fast: false fail-fast: false
runs-on: "ubuntu-latest" runs-on: "ubuntu-latest"
@ -55,7 +55,7 @@ jobs:
if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')" if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
strategy: strategy:
matrix: matrix:
node: ["16.16.0", "18.14.1", "19.6.1"] node: ["16.16.0", "18.14.1"]
flavor: ["dev", "prod"] flavor: ["dev", "prod"]
fail-fast: false fail-fast: false
runs-on: "ubuntu-latest" runs-on: "ubuntu-latest"

5
.github/workflows/cypress.yml vendored
View File

@ -1,8 +1,11 @@
name: Cypress Tests name: Cypress Tests
on: on:
push:
branches: [master]
pull_request: pull_request:
types: [opened, review_requested, synchronize] types: [opened, synchronize]
jobs: jobs:
cypress: cypress:
if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')" if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"

2
README.md
View File

@ -1,5 +1,7 @@
# 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) # 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
Mempool is the fully-featured mempool visualizer, explorer, and API service running at [mempool.space](https://mempool.space/). 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. 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.

14
backend/README.md
View File

@ -160,7 +160,7 @@ npm install -g ts-node nodemon
Then, run the watcher: Then, run the watcher:
``` ```
nodemon src/index.ts --ignore cache/ --ignore pools.json nodemon src/index.ts --ignore cache/
``` ```
`nodemon` should be in npm's global binary folder. If needed, you can determine where that is with `npm -g bin`. `nodemon` should be in npm's global binary folder. If needed, you can determine where that is with `npm -g bin`.
@ -219,6 +219,16 @@ Generate block at regular interval (every 10 seconds in this example):
watch -n 10 "./src/bitcoin-cli -regtest -rpcport=8332 generatetoaddress 1 $address" watch -n 10 "./src/bitcoin-cli -regtest -rpcport=8332 generatetoaddress 1 $address"
``` ```
### Mining pools update
By default, mining pools will be not automatically updated regularly (`config.MEMPOOL.AUTOMATIC_BLOCK_REINDEXING` is set to `false`).
To manually update your mining pools, you can use the `--update-pools` command line flag when you run the nodejs backend. For example `npm run start --update-pools`. This will trigger the mining pools update and automatically re-index appropriate blocks.
You can enabled the automatic mining pools update by settings `config.MEMPOOL.AUTOMATIC_BLOCK_REINDEXING` to `true` in your `mempool-config.json`.
When a `coinbase tag` or `coinbase address` change is detected, all blocks tagged to the `unknown` mining pools (starting from height 130635) will be deleted from the `blocks` table. Additionaly, all blocks which were tagged to the pool which has been updated will also be deleted from the `blocks` table. Of course, those blocks will be automatically reindexed.
### Re-index tables ### Re-index tables
You can manually force the nodejs backend to drop all data from a specified set of tables for future re-index. This is mostly useful for the mining dashboard and the lightning explorer. You can manually force the nodejs backend to drop all data from a specified set of tables for future re-index. This is mostly useful for the mining dashboard and the lightning explorer.
@ -235,4 +245,4 @@ Feb 13 14:55:27 [63246] WARN: <lightning> Indexed data for "hashrates" tables wi
Feb 13 14:55:32 [63246] NOTICE: <lightning> Table hashrates has been truncated Feb 13 14:55:32 [63246] NOTICE: <lightning> Table hashrates has been truncated
``` ```
Reference: https://github.com/mempool/mempool/pull/1269 Reference: https://github.com/mempool/mempool/pull/1269

2
backend/mempool-config.sample.json
View File

@ -22,7 +22,7 @@
"USER_AGENT": "mempool", "USER_AGENT": "mempool",
"STDOUT_LOG_MIN_PRIORITY": "debug", "STDOUT_LOG_MIN_PRIORITY": "debug",
"AUTOMATIC_BLOCK_REINDEXING": false, "AUTOMATIC_BLOCK_REINDEXING": false,
"POOLS_JSON_URL": "https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json", "POOLS_JSON_URL": "https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json",
"POOLS_JSON_TREE_URL": "https://api.github.com/repos/mempool/mining-pools/git/trees/master", "POOLS_JSON_TREE_URL": "https://api.github.com/repos/mempool/mining-pools/git/trees/master",
"AUDIT": false, "AUDIT": false,
"ADVANCED_GBT_AUDIT": false, "ADVANCED_GBT_AUDIT": false,

2
backend/src/__fixtures__/mempool-config.template.json
View File

@ -7,7 +7,7 @@
"HTTP_PORT": 1, "HTTP_PORT": 1,
"SPAWN_CLUSTER_PROCS": 2, "SPAWN_CLUSTER_PROCS": 2,
"API_URL_PREFIX": "__MEMPOOL_API_URL_PREFIX__", "API_URL_PREFIX": "__MEMPOOL_API_URL_PREFIX__",
"AUTOMATIC_BLOCK_REINDEXING": true, "AUTOMATIC_BLOCK_REINDEXING": false,
"POLL_RATE_MS": 3, "POLL_RATE_MS": 3,
"CACHE_DIR": "__MEMPOOL_CACHE_DIR__", "CACHE_DIR": "__MEMPOOL_CACHE_DIR__",
"CLEAR_PROTECTION_MINUTES": 4, "CLEAR_PROTECTION_MINUTES": 4,

3
backend/src/api/audit.ts
View File

@ -119,7 +119,8 @@ class Audit {
} }
const numCensored = Object.keys(isCensored).length; const numCensored = Object.keys(isCensored).length;
const score = matches.length > 0 ? (matches.length / (matches.length + numCensored)) : 0; const numMatches = matches.length - 1; // adjust for coinbase tx
const score = numMatches > 0 ? (numMatches / (numMatches + numCensored)) : 0;
return { return {
censored: Object.keys(isCensored), censored: Object.keys(isCensored),

31
backend/src/api/bitcoin/bitcoin-api.interface.ts
View File

@ -172,4 +172,35 @@ export namespace IBitcoinApi {
} }
} }
export interface BlockStats {
"avgfee": number;
"avgfeerate": number;
"avgtxsize": number;
"blockhash": string;
"feerate_percentiles": [number, number, number, number, number];
"height": number;
"ins": number;
"maxfee": number;
"maxfeerate": number;
"maxtxsize": number;
"medianfee": number;
"mediantime": number;
"mediantxsize": number;
"minfee": number;
"minfeerate": number;
"mintxsize": number;
"outs": number;
"subsidy": number;
"swtotal_size": number;
"swtotal_weight": number;
"swtxs": number;
"time": number;
"total_out": number;
"total_size": number;
"total_weight": number;
"totalfee": number;
"txs": number;
"utxo_increase": number;
"utxo_size_inc": number;
}
} }

2
backend/src/api/bitcoin/bitcoin-api.ts
View File

@ -28,7 +28,7 @@ class BitcoinApi implements AbstractBitcoinApi {
size: block.size, size: block.size,
weight: block.weight, weight: block.weight,
previousblockhash: block.previousblockhash, previousblockhash: block.previousblockhash,
medianTime: block.mediantime, mediantime: block.mediantime,
}; };
} }

10
backend/src/api/bitcoin/bitcoin.routes.ts
View File

@ -217,7 +217,15 @@ class BitcoinRoutes {
res.json(cpfpInfo); res.json(cpfpInfo);
return; return;
} else { } else {
const cpfpInfo = await transactionRepository.$getCpfpInfo(req.params.txId); let cpfpInfo;
if (config.DATABASE.ENABLED) {
cpfpInfo = await transactionRepository.$getCpfpInfo(req.params.txId);
} else {
res.json({
ancestors: []
});
return;
}
if (cpfpInfo) { if (cpfpInfo) {
res.json(cpfpInfo); res.json(cpfpInfo);
return; return;

2
backend/src/api/bitcoin/esplora-api.interface.ts
View File

@ -88,7 +88,7 @@ export namespace IEsploraApi {
size: number; size: number;
weight: number; weight: number;
previousblockhash: string; previousblockhash: string;
medianTime?: number; mediantime: number;
} }
export interface Address { export interface Address {

263
backend/src/api/blocks.ts
View File

@ -2,7 +2,7 @@ import config from '../config';
import bitcoinApi from './bitcoin/bitcoin-api-factory'; import bitcoinApi from './bitcoin/bitcoin-api-factory';
import logger from '../logger'; import logger from '../logger';
import memPool from './mempool'; import memPool from './mempool';
import { BlockExtended, BlockSummary, PoolTag, TransactionExtended, TransactionStripped, TransactionMinerInfo } from '../mempool.interfaces'; import { BlockExtended, BlockExtension, BlockSummary, PoolTag, TransactionExtended, TransactionStripped, TransactionMinerInfo } from '../mempool.interfaces';
import { Common } from './common'; import { Common } from './common';
import diskCache from './disk-cache'; import diskCache from './disk-cache';
import transactionUtils from './transaction-utils'; import transactionUtils from './transaction-utils';
@ -13,7 +13,6 @@ import poolsRepository from '../repositories/PoolsRepository';
import blocksRepository from '../repositories/BlocksRepository'; import blocksRepository from '../repositories/BlocksRepository';
import loadingIndicators from './loading-indicators'; import loadingIndicators from './loading-indicators';
import BitcoinApi from './bitcoin/bitcoin-api'; import BitcoinApi from './bitcoin/bitcoin-api';
import { prepareBlock } from '../utils/blocks-utils';
import BlocksRepository from '../repositories/BlocksRepository'; import BlocksRepository from '../repositories/BlocksRepository';
import HashratesRepository from '../repositories/HashratesRepository'; import HashratesRepository from '../repositories/HashratesRepository';
import indexer from '../indexer'; import indexer from '../indexer';
@ -143,7 +142,7 @@ class Blocks {
* @param block * @param block
* @returns BlockSummary * @returns BlockSummary
*/ */
private summarizeBlock(block: IBitcoinApi.VerboseBlock): BlockSummary { public summarizeBlock(block: IBitcoinApi.VerboseBlock): BlockSummary {
const stripped = block.tx.map((tx) => { const stripped = block.tx.map((tx) => {
return { return {
txid: tx.txid, txid: tx.txid,
@ -166,80 +165,81 @@ class Blocks {
* @returns BlockExtended * @returns BlockExtended
*/ */
private async $getBlockExtended(block: IEsploraApi.Block, transactions: TransactionExtended[]): Promise<BlockExtended> { private async $getBlockExtended(block: IEsploraApi.Block, transactions: TransactionExtended[]): Promise<BlockExtended> {
const blk: BlockExtended = Object.assign({ extras: {} }, block); const coinbaseTx = transactionUtils.stripCoinbaseTransaction(transactions[0]);
blk.extras.reward = transactions[0].vout.reduce((acc, curr) => acc + curr.value, 0);
blk.extras.coinbaseTx = transactionUtils.stripCoinbaseTransaction(transactions[0]); const blk: Partial<BlockExtended> = Object.assign({}, block);
blk.extras.coinbaseRaw = blk.extras.coinbaseTx.vin[0].scriptsig; const extras: Partial<BlockExtension> = {};
blk.extras.usd = priceUpdater.latestPrices.USD;
blk.extras.medianTimestamp = block.medianTime; extras.reward = transactions[0].vout.reduce((acc, curr) => acc + curr.value, 0);
blk.extras.orphans = chainTips.getOrphanedBlocksAtHeight(blk.height); extras.coinbaseRaw = coinbaseTx.vin[0].scriptsig;
extras.orphans = chainTips.getOrphanedBlocksAtHeight(blk.height);
if (block.height === 0) { if (block.height === 0) {
blk.extras.medianFee = 0; // 50th percentiles extras.medianFee = 0; // 50th percentiles
blk.extras.feeRange = [0, 0, 0, 0, 0, 0, 0]; extras.feeRange = [0, 0, 0, 0, 0, 0, 0];
blk.extras.totalFees = 0; extras.totalFees = 0;
blk.extras.avgFee = 0; extras.avgFee = 0;
blk.extras.avgFeeRate = 0; extras.avgFeeRate = 0;
blk.extras.utxoSetChange = 0; extras.utxoSetChange = 0;
blk.extras.avgTxSize = 0; extras.avgTxSize = 0;
blk.extras.totalInputs = 0; extras.totalInputs = 0;
blk.extras.totalOutputs = 1; extras.totalOutputs = 1;
blk.extras.totalOutputAmt = 0; extras.totalOutputAmt = 0;
blk.extras.segwitTotalTxs = 0; extras.segwitTotalTxs = 0;
blk.extras.segwitTotalSize = 0; extras.segwitTotalSize = 0;
blk.extras.segwitTotalWeight = 0; extras.segwitTotalWeight = 0;
} else { } else {
const stats = await bitcoinClient.getBlockStats(block.id); const stats: IBitcoinApi.BlockStats = await bitcoinClient.getBlockStats(block.id);
blk.extras.medianFee = stats.feerate_percentiles[2]; // 50th percentiles extras.medianFee = stats.feerate_percentiles[2]; // 50th percentiles
blk.extras.feeRange = [stats.minfeerate, stats.feerate_percentiles, stats.maxfeerate].flat(); extras.feeRange = [stats.minfeerate, stats.feerate_percentiles, stats.maxfeerate].flat();
blk.extras.totalFees = stats.totalfee; extras.totalFees = stats.totalfee;
blk.extras.avgFee = stats.avgfee; extras.avgFee = stats.avgfee;
blk.extras.avgFeeRate = stats.avgfeerate; extras.avgFeeRate = stats.avgfeerate;
blk.extras.utxoSetChange = stats.utxo_increase; extras.utxoSetChange = stats.utxo_increase;
blk.extras.avgTxSize = Math.round(stats.total_size / stats.txs * 100) * 0.01; extras.avgTxSize = Math.round(stats.total_size / stats.txs * 100) * 0.01;
blk.extras.totalInputs = stats.ins; extras.totalInputs = stats.ins;
blk.extras.totalOutputs = stats.outs; extras.totalOutputs = stats.outs;
blk.extras.totalOutputAmt = stats.total_out; extras.totalOutputAmt = stats.total_out;
blk.extras.segwitTotalTxs = stats.swtxs; extras.segwitTotalTxs = stats.swtxs;
blk.extras.segwitTotalSize = stats.swtotal_size; extras.segwitTotalSize = stats.swtotal_size;
blk.extras.segwitTotalWeight = stats.swtotal_weight; extras.segwitTotalWeight = stats.swtotal_weight;
} }
if (Common.blocksSummariesIndexingEnabled()) { if (Common.blocksSummariesIndexingEnabled()) {
blk.extras.feePercentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(block.id); extras.feePercentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(block.id);
if (blk.extras.feePercentiles !== null) { if (extras.feePercentiles !== null) {
blk.extras.medianFeeAmt = blk.extras.feePercentiles[3]; extras.medianFeeAmt = extras.feePercentiles[3];
} }
} }
blk.extras.virtualSize = block.weight / 4.0; extras.virtualSize = block.weight / 4.0;
if (blk.extras.coinbaseTx.vout.length > 0) { if (coinbaseTx?.vout.length > 0) {
blk.extras.coinbaseAddress = blk.extras.coinbaseTx.vout[0].scriptpubkey_address ?? null; extras.coinbaseAddress = coinbaseTx.vout[0].scriptpubkey_address ?? null;
blk.extras.coinbaseSignature = blk.extras.coinbaseTx.vout[0].scriptpubkey_asm ?? null; extras.coinbaseSignature = coinbaseTx.vout[0].scriptpubkey_asm ?? null;
blk.extras.coinbaseSignatureAscii = transactionUtils.hex2ascii(blk.extras.coinbaseTx.vin[0].scriptsig) ?? null; extras.coinbaseSignatureAscii = transactionUtils.hex2ascii(coinbaseTx.vin[0].scriptsig) ?? null;
} else { } else {
blk.extras.coinbaseAddress = null; extras.coinbaseAddress = null;
blk.extras.coinbaseSignature = null; extras.coinbaseSignature = null;
blk.extras.coinbaseSignatureAscii = null; extras.coinbaseSignatureAscii = null;
} }
const header = await bitcoinClient.getBlockHeader(block.id, false); const header = await bitcoinClient.getBlockHeader(block.id, false);
blk.extras.header = header; extras.header = header;
const coinStatsIndex = indexer.isCoreIndexReady('coinstatsindex'); const coinStatsIndex = indexer.isCoreIndexReady('coinstatsindex');
if (coinStatsIndex !== null && coinStatsIndex.best_block_height >= block.height) { if (coinStatsIndex !== null && coinStatsIndex.best_block_height >= block.height) {
const txoutset = await bitcoinClient.getTxoutSetinfo('none', block.height); const txoutset = await bitcoinClient.getTxoutSetinfo('none', block.height);
blk.extras.utxoSetSize = txoutset.txouts, extras.utxoSetSize = txoutset.txouts,
blk.extras.totalInputAmt = Math.round(txoutset.block_info.prevout_spent * 100000000); extras.totalInputAmt = Math.round(txoutset.block_info.prevout_spent * 100000000);
} else { } else {
blk.extras.utxoSetSize = null; extras.utxoSetSize = null;
blk.extras.totalInputAmt = null; extras.totalInputAmt = null;
} }
if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) { if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) {
let pool: PoolTag; let pool: PoolTag;
if (blk.extras?.coinbaseTx !== undefined) { if (coinbaseTx !== undefined) {
pool = await this.$findBlockMiner(blk.extras?.coinbaseTx); pool = await this.$findBlockMiner(coinbaseTx);
} else { } else {
if (config.DATABASE.ENABLED === true) { if (config.DATABASE.ENABLED === true) {
pool = await poolsRepository.$getUnknownPool(); pool = await poolsRepository.$getUnknownPool();
@ -252,22 +252,24 @@ class Blocks {
logger.warn(`Cannot assign pool to block ${blk.height} and 'unknown' pool does not exist. ` + logger.warn(`Cannot assign pool to block ${blk.height} and 'unknown' pool does not exist. ` +
`Check your "pools" table entries`); `Check your "pools" table entries`);
} else { } else {
blk.extras.pool = { extras.pool = {
id: pool.id, id: pool.uniqueId,
name: pool.name, name: pool.name,
slug: pool.slug, slug: pool.slug,
}; };
} }
extras.matchRate = null;
if (config.MEMPOOL.AUDIT) { if (config.MEMPOOL.AUDIT) {
const auditScore = await BlocksAuditsRepository.$getBlockAuditScore(block.id); const auditScore = await BlocksAuditsRepository.$getBlockAuditScore(block.id);
if (auditScore != null) { if (auditScore != null) {
blk.extras.matchRate = auditScore.matchRate; extras.matchRate = auditScore.matchRate;
} }
} }
} }
return blk; blk.extras = <BlockExtension>extras;
return <BlockExtended>blk;
} }
/** /**
@ -293,15 +295,18 @@ class Blocks {
} else { } else {
pools = poolsParser.miningPools; pools = poolsParser.miningPools;
} }
for (let i = 0; i < pools.length; ++i) { for (let i = 0; i < pools.length; ++i) {
if (address !== undefined) { if (address !== undefined) {
const addresses: string[] = JSON.parse(pools[i].addresses); const addresses: string[] = typeof pools[i].addresses === 'string' ?
JSON.parse(pools[i].addresses) : pools[i].addresses;
if (addresses.indexOf(address) !== -1) { if (addresses.indexOf(address) !== -1) {
return pools[i]; return pools[i];
} }
} }
const regexes: string[] = JSON.parse(pools[i].regexes); const regexes: string[] = typeof pools[i].regexes === 'string' ?
JSON.parse(pools[i].regexes) : pools[i].regexes;
for (let y = 0; y < regexes.length; ++y) { for (let y = 0; y < regexes.length; ++y) {
const regex = new RegExp(regexes[y], 'i'); const regex = new RegExp(regexes[y], 'i');
const match = asciiScriptSig.match(regex); const match = asciiScriptSig.match(regex);
@ -479,7 +484,7 @@ class Blocks {
loadingIndicators.setProgress('block-indexing', progress, false); loadingIndicators.setProgress('block-indexing', progress, false);
} }
const blockHash = await bitcoinApi.$getBlockHash(blockHeight); const blockHash = await bitcoinApi.$getBlockHash(blockHeight);
const block = BitcoinApi.convertBlock(await bitcoinClient.getBlock(blockHash)); const block: IEsploraApi.Block = await bitcoinApi.$getBlock(blockHash);
const transactions = await this.$getTransactionsExtended(blockHash, block.height, true, true); const transactions = await this.$getTransactionsExtended(blockHash, block.height, true, true);
const blockExtended = await this.$getBlockExtended(block, transactions); const blockExtended = await this.$getBlockExtended(block, transactions);
@ -527,13 +532,13 @@ class Blocks {
if (blockchainInfo.blocks === blockchainInfo.headers) { if (blockchainInfo.blocks === blockchainInfo.headers) {
const heightDiff = blockHeightTip % 2016; const heightDiff = blockHeightTip % 2016;
const blockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff); const blockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff);
const block = BitcoinApi.convertBlock(await bitcoinClient.getBlock(blockHash)); const block: IEsploraApi.Block = await bitcoinApi.$getBlock(blockHash);
this.lastDifficultyAdjustmentTime = block.timestamp; this.lastDifficultyAdjustmentTime = block.timestamp;
this.currentDifficulty = block.difficulty; this.currentDifficulty = block.difficulty;
if (blockHeightTip >= 2016) { if (blockHeightTip >= 2016) {
const previousPeriodBlockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff - 2016); const previousPeriodBlockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff - 2016);
const previousPeriodBlock = await bitcoinClient.getBlock(previousPeriodBlockHash) const previousPeriodBlock: IEsploraApi.Block = await bitcoinApi.$getBlock(previousPeriodBlockHash);
this.previousDifficultyRetarget = (block.difficulty - previousPeriodBlock.difficulty) / previousPeriodBlock.difficulty * 100; this.previousDifficultyRetarget = (block.difficulty - previousPeriodBlock.difficulty) / previousPeriodBlock.difficulty * 100;
logger.debug(`Initial difficulty adjustment data set.`); logger.debug(`Initial difficulty adjustment data set.`);
} }
@ -565,18 +570,18 @@ class Blocks {
if (Common.indexingEnabled()) { if (Common.indexingEnabled()) {
if (!fastForwarded) { if (!fastForwarded) {
const lastBlock = await blocksRepository.$getBlockByHeight(blockExtended.height - 1); const lastBlock = await blocksRepository.$getBlockByHeight(blockExtended.height - 1);
if (lastBlock !== null && blockExtended.previousblockhash !== lastBlock['hash']) { if (lastBlock !== null && blockExtended.previousblockhash !== lastBlock.id) {
logger.warn(`Chain divergence detected at block ${lastBlock['height']}, re-indexing most recent data`); logger.warn(`Chain divergence detected at block ${lastBlock.height}, re-indexing most recent data`);
// We assume there won't be a reorg with more than 10 block depth // We assume there won't be a reorg with more than 10 block depth
await BlocksRepository.$deleteBlocksFrom(lastBlock['height'] - 10); await BlocksRepository.$deleteBlocksFrom(lastBlock.height - 10);
await HashratesRepository.$deleteLastEntries(); await HashratesRepository.$deleteLastEntries();
await BlocksSummariesRepository.$deleteBlocksFrom(lastBlock['height'] - 10); await BlocksSummariesRepository.$deleteBlocksFrom(lastBlock.height - 10);
await cpfpRepository.$deleteClustersFrom(lastBlock['height'] - 10); await cpfpRepository.$deleteClustersFrom(lastBlock.height - 10);
for (let i = 10; i >= 0; --i) { for (let i = 10; i >= 0; --i) {
const newBlock = await this.$indexBlock(lastBlock['height'] - i); const newBlock = await this.$indexBlock(lastBlock.height - i);
await this.$getStrippedBlockTransactions(newBlock.id, true, true); await this.$getStrippedBlockTransactions(newBlock.id, true, true);
if (config.MEMPOOL.CPFP_INDEXING) { if (config.MEMPOOL.CPFP_INDEXING) {
await this.$indexCPFP(newBlock.id, lastBlock['height'] - i); await this.$indexCPFP(newBlock.id, lastBlock.height - i);
} }
} }
await mining.$indexDifficultyAdjustments(); await mining.$indexDifficultyAdjustments();
@ -652,12 +657,12 @@ class Blocks {
if (Common.indexingEnabled()) { if (Common.indexingEnabled()) {
const dbBlock = await blocksRepository.$getBlockByHeight(height); const dbBlock = await blocksRepository.$getBlockByHeight(height);
if (dbBlock !== null) { if (dbBlock !== null) {
return prepareBlock(dbBlock); return dbBlock;
} }
} }
const blockHash = await bitcoinApi.$getBlockHash(height); const blockHash = await bitcoinApi.$getBlockHash(height);
const block = BitcoinApi.convertBlock(await bitcoinClient.getBlock(blockHash)); const block: IEsploraApi.Block = await bitcoinApi.$getBlock(blockHash);
const transactions = await this.$getTransactionsExtended(blockHash, block.height, true); const transactions = await this.$getTransactionsExtended(blockHash, block.height, true);
const blockExtended = await this.$getBlockExtended(block, transactions); const blockExtended = await this.$getBlockExtended(block, transactions);
@ -665,11 +670,11 @@ class Blocks {
await blocksRepository.$saveBlockInDatabase(blockExtended); await blocksRepository.$saveBlockInDatabase(blockExtended);
} }
return prepareBlock(blockExtended); return blockExtended;
} }
/** /**
* Index a block by hash if it's missing from the database. Returns the block after indexing * Get one block by its hash
*/ */
public async $getBlock(hash: string): Promise<BlockExtended | IEsploraApi.Block> { public async $getBlock(hash: string): Promise<BlockExtended | IEsploraApi.Block> {
// Check the memory cache // Check the memory cache
@ -678,31 +683,14 @@ class Blocks {
return blockByHash; return blockByHash;
} }
// Block has already been indexed // Not Bitcoin network, return the block as it from the bitcoin backend
if (Common.indexingEnabled()) {
const dbBlock = await blocksRepository.$getBlockByHash(hash);
if (dbBlock != null) {
return prepareBlock(dbBlock);
}
}
// Not Bitcoin network, return the block as it
if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) { if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) {
return await bitcoinApi.$getBlock(hash); return await bitcoinApi.$getBlock(hash);
} }
let block = await bitcoinClient.getBlock(hash);
block = prepareBlock(block);
// Bitcoin network, add our custom data on top // Bitcoin network, add our custom data on top
const transactions = await this.$getTransactionsExtended(hash, block.height, true); const block: IEsploraApi.Block = await bitcoinApi.$getBlock(hash);
const blockExtended = await this.$getBlockExtended(block, transactions); return await this.$indexBlock(block.height);
if (Common.indexingEnabled()) {
delete(blockExtended['coinbaseTx']);
await blocksRepository.$saveBlockInDatabase(blockExtended);
}
return blockExtended;
} }
public async $getStrippedBlockTransactions(hash: string, skipMemoryCache = false, public async $getStrippedBlockTransactions(hash: string, skipMemoryCache = false,
@ -736,6 +724,18 @@ class Blocks {
return summary.transactions; return summary.transactions;
} }
/**
* Get 15 blocks
*
* Internally this function uses two methods to get the blocks, and
* the method is automatically selected:
* - Using previous block hash links
* - Using block height
*
* @param fromHeight
* @param limit
* @returns
*/
public async $getBlocks(fromHeight?: number, limit: number = 15): Promise<BlockExtended[]> { public async $getBlocks(fromHeight?: number, limit: number = 15): Promise<BlockExtended[]> {
let currentHeight = fromHeight !== undefined ? fromHeight : this.currentBlockHeight; let currentHeight = fromHeight !== undefined ? fromHeight : this.currentBlockHeight;
if (currentHeight > this.currentBlockHeight) { if (currentHeight > this.currentBlockHeight) {
@ -748,27 +748,15 @@ class Blocks {
return returnBlocks; return returnBlocks;
} }
// Check if block height exist in local cache to skip the hash lookup
const blockByHeight = this.getBlocks().find((b) => b.height === currentHeight);
let startFromHash: string | null = null;
if (blockByHeight) {
startFromHash = blockByHeight.id;
} else if (!Common.indexingEnabled()) {
startFromHash = await bitcoinApi.$getBlockHash(currentHeight);
}
let nextHash = startFromHash;
for (let i = 0; i < limit && currentHeight >= 0; i++) { for (let i = 0; i < limit && currentHeight >= 0; i++) {
let block = this.getBlocks().find((b) => b.height === currentHeight); let block = this.getBlocks().find((b) => b.height === currentHeight);
if (block) { if (block) {
// Using the memory cache (find by height)
returnBlocks.push(block); returnBlocks.push(block);
} else if (Common.indexingEnabled()) { } else {
// Using indexing (find by height, index on the fly, save in database)
block = await this.$indexBlock(currentHeight); block = await this.$indexBlock(currentHeight);
returnBlocks.push(block); returnBlocks.push(block);
} else if (nextHash != null) {
block = await this.$indexBlock(currentHeight);
nextHash = block.previousblockhash;
returnBlocks.push(block);
} }
currentHeight--; currentHeight--;
} }
@ -790,7 +778,7 @@ class Blocks {
const blocks: any[] = []; const blocks: any[] = [];
while (fromHeight <= toHeight) { while (fromHeight <= toHeight) {
let block: any = await blocksRepository.$getBlockByHeight(fromHeight); let block: BlockExtended | null = await blocksRepository.$getBlockByHeight(fromHeight);
if (!block) { if (!block) {
await this.$indexBlock(fromHeight); await this.$indexBlock(fromHeight);
block = await blocksRepository.$getBlockByHeight(fromHeight); block = await blocksRepository.$getBlockByHeight(fromHeight);
@ -803,11 +791,11 @@ class Blocks {
const cleanBlock: any = { const cleanBlock: any = {
height: block.height ?? null, height: block.height ?? null,
hash: block.id ?? null, hash: block.id ?? null,
timestamp: block.blockTimestamp ?? null, timestamp: block.timestamp ?? null,
median_timestamp: block.medianTime ?? null, median_timestamp: block.mediantime ?? null,
previous_block_hash: block.previousblockhash ?? null, previous_block_hash: block.previousblockhash ?? null,
difficulty: block.difficulty ?? null, difficulty: block.difficulty ?? null,
header: block.header ?? null, header: block.extras.header ?? null,
version: block.version ?? null, version: block.version ?? null,
bits: block.bits ?? null, bits: block.bits ?? null,
nonce: block.nonce ?? null, nonce: block.nonce ?? null,
@ -815,29 +803,30 @@ class Blocks {
weight: block.weight ?? null, weight: block.weight ?? null,
tx_count: block.tx_count ?? null, tx_count: block.tx_count ?? null,
merkle_root: block.merkle_root ?? null, merkle_root: block.merkle_root ?? null,
reward: block.reward ?? null, reward: block.extras.reward ?? null,
total_fee_amt: block.fees ?? null, total_fee_amt: block.extras.totalFees ?? null,
avg_fee_amt: block.avg_fee ?? null, avg_fee_amt: block.extras.avgFee ?? null,
median_fee_amt: block.median_fee_amt ?? null, median_fee_amt: block.extras.medianFeeAmt ?? null,
fee_amt_percentiles: block.fee_percentiles ?? null, fee_amt_percentiles: block.extras.feePercentiles ?? null,
avg_fee_rate: block.avg_fee_rate ?? null, avg_fee_rate: block.extras.avgFeeRate ?? null,
median_fee_rate: block.median_fee ?? null, median_fee_rate: block.extras.medianFee ?? null,
fee_rate_percentiles: block.fee_span ?? null, fee_rate_percentiles: block.extras.feeRange ?? null,
total_inputs: block.total_inputs ?? null, total_inputs: block.extras.totalInputs ?? null,
total_input_amt: block.total_input_amt ?? null, total_input_amt: block.extras.totalInputAmt ?? null,
total_outputs: block.total_outputs ?? null, total_outputs: block.extras.totalOutputs ?? null,
total_output_amt: block.total_output_amt ?? null, total_output_amt: block.extras.totalOutputAmt ?? null,
segwit_total_txs: block.segwit_total_txs ?? null, segwit_total_txs: block.extras.segwitTotalTxs ?? null,
segwit_total_size: block.segwit_total_size ?? null, segwit_total_size: block.extras.segwitTotalSize ?? null,
segwit_total_weight: block.segwit_total_weight ?? null, segwit_total_weight: block.extras.segwitTotalWeight ?? null,
avg_tx_size: block.avg_tx_size ?? null, avg_tx_size: block.extras.avgTxSize ?? null,
utxoset_change: block.utxoset_change ?? null, utxoset_change: block.extras.utxoSetChange ?? null,
utxoset_size: block.utxoset_size ?? null, utxoset_size: block.extras.utxoSetSize ?? null,
coinbase_raw: block.coinbase_raw ?? null, coinbase_raw: block.extras.coinbaseRaw ?? null,
coinbase_address: block.coinbase_address ?? null, coinbase_address: block.extras.coinbaseAddress ?? null,
coinbase_signature: block.coinbase_signature ?? null, coinbase_signature: block.extras.coinbaseSignature ?? null,
coinbase_signature_ascii: block.coinbase_signature_ascii ?? null, coinbase_signature_ascii: block.extras.coinbaseSignatureAscii ?? null,
pool_slug: block.pool_slug ?? null, pool_slug: block.extras.pool.slug ?? null,
pool_id: block.extras.pool.id ?? null,
}; };
if (Common.blocksSummariesIndexingEnabled() && cleanBlock.fee_amt_percentiles === null) { if (Common.blocksSummariesIndexingEnabled() && cleanBlock.fee_amt_percentiles === null) {

10
backend/src/api/chain-tips.ts
View File

@ -1,5 +1,5 @@
import logger from "../logger"; import logger from '../logger';
import bitcoinClient from "./bitcoin/bitcoin-client"; import bitcoinClient from './bitcoin/bitcoin-client';
export interface ChainTip { export interface ChainTip {
height: number; height: number;
@ -43,7 +43,11 @@ class ChainTips {
} }
} }
public getOrphanedBlocksAtHeight(height: number): OrphanedBlock[] { public getOrphanedBlocksAtHeight(height: number | undefined): OrphanedBlock[] {
if (height === undefined) {
return [];
}
const orphans: OrphanedBlock[] = []; const orphans: OrphanedBlock[] = [];
for (const block of this.orphanedBlocks) { for (const block of this.orphanedBlocks) {
if (block.height === height) { if (block.height === height) {

15
backend/src/api/common.ts
View File

@ -237,14 +237,21 @@ export class Common {
].join('x'); ].join('x');
} }
static utcDateToMysql(date?: number): string { static utcDateToMysql(date?: number | null): string | null {
if (date === null) {
return null;
}
const d = new Date((date || 0) * 1000); const d = new Date((date || 0) * 1000);
return d.toISOString().split('T')[0] + ' ' + d.toTimeString().split(' ')[0]; return d.toISOString().split('T')[0] + ' ' + d.toTimeString().split(' ')[0];
} }
static findSocketNetwork(addr: string): {network: string | null, url: string} { static findSocketNetwork(addr: string): {network: string | null, url: string} {
let network: string | null = null; let network: string | null = null;
let url = addr.split('://')[1]; let url: string = addr;
if (config.LIGHTNING.BACKEND === 'cln') {
url = addr.split('://')[1];
}
if (!url) { if (!url) {
return { return {
@ -261,7 +268,7 @@ export class Common {
} }
} else if (addr.indexOf('i2p') !== -1) { } else if (addr.indexOf('i2p') !== -1) {
network = 'i2p'; network = 'i2p';
} else if (addr.indexOf('ipv4') !== -1) { } else if (addr.indexOf('ipv4') !== -1 || (config.LIGHTNING.BACKEND === 'lnd' && isIP(url.split(':')[0]) === 4)) {
const ipv = isIP(url.split(':')[0]); const ipv = isIP(url.split(':')[0]);
if (ipv === 4) { if (ipv === 4) {
network = 'ipv4'; network = 'ipv4';
@ -271,7 +278,7 @@ export class Common {
url: addr, url: addr,
}; };
} }
} else if (addr.indexOf('ipv6') !== -1) { } else if (addr.indexOf('ipv6') !== -1 || (config.LIGHTNING.BACKEND === 'lnd' && url.indexOf(']:'))) {
url = url.split('[')[1].split(']')[0]; url = url.split('[')[1].split(']')[0];
const ipv = isIP(url); const ipv = isIP(url);
if (ipv === 6) { if (ipv === 6) {

35
backend/src/api/database-migration.ts
View File

@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository';
import { RowDataPacket } from 'mysql2'; import { RowDataPacket } from 'mysql2';
class DatabaseMigration { class DatabaseMigration {
private static currentVersion = 56; private static currentVersion = 57;
private queryTimeout = 3600_000; private queryTimeout = 3600_000;
private statisticsAddedIndexed = false; private statisticsAddedIndexed = false;
private uniqueLogs: string[] = []; private uniqueLogs: string[] = [];
@ -500,6 +500,11 @@ class DatabaseMigration {
this.uniqueLog(logger.notice, '`pools` table has been truncated`'); this.uniqueLog(logger.notice, '`pools` table has been truncated`');
await this.updateToSchemaVersion(56); await this.updateToSchemaVersion(56);
} }
if (databaseSchemaVersion < 57 && isBitcoin === true) {
await this.$executeQuery(`ALTER TABLE nodes MODIFY updated_at datetime NULL`);
await this.updateToSchemaVersion(57);
}
} }
/** /**
@ -1012,26 +1017,16 @@ class DatabaseMigration {
) ENGINE=InnoDB DEFAULT CHARSET=utf8;`; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
} }
public async $truncateIndexedData(tables: string[]) { public async $blocksReindexingTruncate(): Promise<void> {
const allowedTables = ['blocks', 'hashrates', 'prices']; logger.warn(`Truncating pools, blocks and hashrates for re-indexing (using '--reindex-blocks'). You can cancel this command within 5 seconds`);
await Common.sleep$(5000);
try { await this.$executeQuery(`TRUNCATE blocks`);
for (const table of tables) { await this.$executeQuery(`TRUNCATE hashrates`);
if (!allowedTables.includes(table)) { await this.$executeQuery('DELETE FROM `pools`');
logger.debug(`Table ${table} cannot to be re-indexed (not allowed)`); await this.$executeQuery('ALTER TABLE pools AUTO_INCREMENT = 1');
continue; await this.$executeQuery(`UPDATE state SET string = NULL WHERE name = 'pools_json_sha'`);
} }
await this.$executeQuery(`TRUNCATE ${table}`, true);
if (table === 'hashrates') {
await this.$executeQuery('UPDATE state set number = 0 where name = "last_hashrates_indexing"', true);
}
logger.notice(`Table ${table} has been truncated`);
}
} catch (e) {
logger.warn(`Unable to erase indexed data`);
}
}
private async $convertCompactCpfpTables(): Promise<void> { private async $convertCompactCpfpTables(): Promise<void> {
try { try {

2
backend/src/api/disk-cache.ts
View File

@ -9,7 +9,7 @@ import { TransactionExtended } from '../mempool.interfaces';
import { Common } from './common'; import { Common } from './common';
class DiskCache { class DiskCache {
private cacheSchemaVersion = 2; private cacheSchemaVersion = 3;
private static FILE_NAME = config.MEMPOOL.CACHE_DIR + '/cache.json'; private static FILE_NAME = config.MEMPOOL.CACHE_DIR + '/cache.json';
private static FILE_NAMES = config.MEMPOOL.CACHE_DIR + '/cache{number}.json'; private static FILE_NAMES = config.MEMPOOL.CACHE_DIR + '/cache{number}.json';

11
backend/src/api/explorer/channels.api.ts
View File

@ -559,6 +559,17 @@ class ChannelsApi {
const policy1: Partial<ILightningApi.RoutingPolicy> = channel.node1_policy || {}; const policy1: Partial<ILightningApi.RoutingPolicy> = channel.node1_policy || {};
const policy2: Partial<ILightningApi.RoutingPolicy> = channel.node2_policy || {}; const policy2: Partial<ILightningApi.RoutingPolicy> = channel.node2_policy || {};
// https://github.com/mempool/mempool/issues/3006
if ((channel.last_update ?? 0) < 1514736061) { // January 1st 2018
channel.last_update = null;
}
if ((policy1.last_update ?? 0) < 1514736061) { // January 1st 2018
policy1.last_update = null;
}
if ((policy2.last_update ?? 0) < 1514736061) { // January 1st 2018
policy2.last_update = null;
}
const query = `INSERT INTO channels const query = `INSERT INTO channels
( (
id, id,

25
backend/src/api/explorer/nodes.api.ts
View File

@ -228,7 +228,7 @@ class NodesApi {
nodes.capacity nodes.capacity
FROM nodes FROM nodes
ORDER BY capacity DESC ORDER BY capacity DESC
LIMIT 100 LIMIT 6
`; `;
[rows] = await DB.query(query); [rows] = await DB.query(query);
@ -269,14 +269,26 @@ class NodesApi {
let query: string; let query: string;
if (full === false) { if (full === false) {
query = ` query = `
SELECT nodes.public_key as publicKey, IF(nodes.alias = '', SUBSTRING(nodes.public_key, 1, 20), alias) as alias, SELECT
nodes.channels nodes.public_key as publicKey,
IF(nodes.alias = '', SUBSTRING(nodes.public_key, 1, 20), alias) as alias,
nodes.channels,
geo_names_city.names as city, geo_names_country.names as country,
geo_names_iso.names as iso_code, geo_names_subdivision.names as subdivision
FROM nodes FROM nodes
LEFT JOIN geo_names geo_names_country ON geo_names_country.id = nodes.country_id AND geo_names_country.type = 'country'
LEFT JOIN geo_names geo_names_city ON geo_names_city.id = nodes.city_id AND geo_names_city.type = 'city'
LEFT JOIN geo_names geo_names_iso ON geo_names_iso.id = nodes.country_id AND geo_names_iso.type = 'country_iso_code'
LEFT JOIN geo_names geo_names_subdivision on geo_names_subdivision.id = nodes.subdivision_id AND geo_names_subdivision.type = 'division'
ORDER BY channels DESC ORDER BY channels DESC
LIMIT 100; LIMIT 6;
`; `;
[rows] = await DB.query(query); [rows] = await DB.query(query);
for (let i = 0; i < rows.length; ++i) {
rows[i].country = JSON.parse(rows[i].country);
rows[i].city = JSON.parse(rows[i].city);
}
} else { } else {
query = ` query = `
SELECT nodes.public_key AS publicKey, IF(nodes.alias = '', SUBSTRING(nodes.public_key, 1, 20), alias) as alias, SELECT nodes.public_key AS publicKey, IF(nodes.alias = '', SUBSTRING(nodes.public_key, 1, 20), alias) as alias,
@ -630,6 +642,11 @@ class NodesApi {
*/ */
public async $saveNode(node: ILightningApi.Node): Promise<void> { public async $saveNode(node: ILightningApi.Node): Promise<void> {
try { try {
// https://github.com/mempool/mempool/issues/3006
if ((node.last_update ?? 0) < 1514736061) { // January 1st 2018
node.last_update = null;
}
const sockets = (node.addresses?.map(a => a.addr).join(',')) ?? ''; const sockets = (node.addresses?.map(a => a.addr).join(',')) ?? '';
const query = `INSERT INTO nodes( const query = `INSERT INTO nodes(
public_key, public_key,

6
backend/src/api/lightning/lightning-api.interface.ts
View File

@ -21,7 +21,7 @@ export namespace ILightningApi {
export interface Channel { export interface Channel {
channel_id: string; channel_id: string;
chan_point: string; chan_point: string;
last_update: number; last_update: number | null;
node1_pub: string; node1_pub: string;
node2_pub: string; node2_pub: string;
capacity: string; capacity: string;
@ -36,11 +36,11 @@ export namespace ILightningApi {
fee_rate_milli_msat: string; fee_rate_milli_msat: string;
disabled: boolean; disabled: boolean;
max_htlc_msat: string; max_htlc_msat: string;
last_update: number; last_update: number | null;
} }
export interface Node { export interface Node {
last_update: number; last_update: number | null;
pub_key: string; pub_key: string;
alias: string; alias: string;
addresses: { addresses: {

14
backend/src/api/mining/mining.ts
View File

@ -11,6 +11,8 @@ import DifficultyAdjustmentsRepository from '../../repositories/DifficultyAdjust
import config from '../../config'; import config from '../../config';
import BlocksAuditsRepository from '../../repositories/BlocksAuditsRepository'; import BlocksAuditsRepository from '../../repositories/BlocksAuditsRepository';
import PricesRepository from '../../repositories/PricesRepository'; import PricesRepository from '../../repositories/PricesRepository';
import bitcoinApiFactory from '../bitcoin/bitcoin-api-factory';
import { IEsploraApi } from '../bitcoin/esplora-api.interface';
class Mining { class Mining {
blocksPriceIndexingRunning = false; blocksPriceIndexingRunning = false;
@ -189,8 +191,8 @@ class Mining {
try { try {
const oldestConsecutiveBlockTimestamp = 1000 * (await BlocksRepository.$getOldestConsecutiveBlock()).timestamp; const oldestConsecutiveBlockTimestamp = 1000 * (await BlocksRepository.$getOldestConsecutiveBlock()).timestamp;
const genesisBlock = await bitcoinClient.getBlock(await bitcoinClient.getBlockHash(0)); const genesisBlock: IEsploraApi.Block = await bitcoinApiFactory.$getBlock(await bitcoinClient.getBlockHash(0));
const genesisTimestamp = genesisBlock.time * 1000; const genesisTimestamp = genesisBlock.timestamp * 1000;
const indexedTimestamp = await HashratesRepository.$getWeeklyHashrateTimestamps(); const indexedTimestamp = await HashratesRepository.$getWeeklyHashrateTimestamps();
const hashrates: any[] = []; const hashrates: any[] = [];
@ -292,8 +294,8 @@ class Mining {
const oldestConsecutiveBlockTimestamp = 1000 * (await BlocksRepository.$getOldestConsecutiveBlock()).timestamp; const oldestConsecutiveBlockTimestamp = 1000 * (await BlocksRepository.$getOldestConsecutiveBlock()).timestamp;
try { try {
const genesisBlock = await bitcoinClient.getBlock(await bitcoinClient.getBlockHash(0)); const genesisBlock: IEsploraApi.Block = await bitcoinApiFactory.$getBlock(await bitcoinClient.getBlockHash(0));
const genesisTimestamp = genesisBlock.time * 1000; const genesisTimestamp = genesisBlock.timestamp * 1000;
const indexedTimestamp = (await HashratesRepository.$getRawNetworkDailyHashrate(null)).map(hashrate => hashrate.timestamp); const indexedTimestamp = (await HashratesRepository.$getRawNetworkDailyHashrate(null)).map(hashrate => hashrate.timestamp);
const lastMidnight = this.getDateMidnight(new Date()); const lastMidnight = this.getDateMidnight(new Date());
let toTimestamp = Math.round(lastMidnight.getTime()); let toTimestamp = Math.round(lastMidnight.getTime());
@ -394,13 +396,13 @@ class Mining {
} }
const blocks: any = await BlocksRepository.$getBlocksDifficulty(); const blocks: any = await BlocksRepository.$getBlocksDifficulty();
const genesisBlock = await bitcoinClient.getBlock(await bitcoinClient.getBlockHash(0)); const genesisBlock: IEsploraApi.Block = await bitcoinApiFactory.$getBlock(await bitcoinClient.getBlockHash(0));
let currentDifficulty = genesisBlock.difficulty; let currentDifficulty = genesisBlock.difficulty;
let totalIndexed = 0; let totalIndexed = 0;
if (config.MEMPOOL.INDEXING_BLOCKS_AMOUNT === -1 && indexedHeights[0] !== true) { if (config.MEMPOOL.INDEXING_BLOCKS_AMOUNT === -1 && indexedHeights[0] !== true) {
await DifficultyAdjustmentsRepository.$saveAdjustments({ await DifficultyAdjustmentsRepository.$saveAdjustments({
time: genesisBlock.time, time: genesisBlock.timestamp,
height: 0, height: 0,
difficulty: currentDifficulty, difficulty: currentDifficulty,
adjustment: 0.0, adjustment: 0.0,

6
backend/src/api/pools-parser.ts
View File

@ -8,6 +8,7 @@ import diskCache from './disk-cache';
class PoolsParser { class PoolsParser {
miningPools: any[] = []; miningPools: any[] = [];
unknownPool: any = { unknownPool: any = {
'id': 0,
'name': 'Unknown', 'name': 'Unknown',
'link': 'https://learnmeabitcoin.com/technical/coinbase-transaction', 'link': 'https://learnmeabitcoin.com/technical/coinbase-transaction',
'regexes': '[]', 'regexes': '[]',
@ -27,6 +28,7 @@ class PoolsParser {
public setMiningPools(pools): void { public setMiningPools(pools): void {
for (const pool of pools) { for (const pool of pools) {
pool.regexes = pool.tags; pool.regexes = pool.tags;
pool.slug = pool.name.replace(/[^a-z0-9]/gi, '').toLowerCase();
delete(pool.tags); delete(pool.tags);
} }
this.miningPools = pools; this.miningPools = pools;
@ -74,7 +76,7 @@ class PoolsParser {
} }
} }
logger.info('Mining pools.json import completed'); logger.info('Mining pools-v2.json import completed');
} }
/** /**
@ -116,7 +118,7 @@ class PoolsParser {
return; return;
} }
// Get oldest blocks mined by the pool and assume pools.json updates only concern most recent years // Get oldest blocks mined by the pool and assume pools-v2.json updates only concern most recent years
// Ignore early days of Bitcoin as there were no mining pool yet // Ignore early days of Bitcoin as there were no mining pool yet
const [oldestPoolBlock]: any[] = await DB.query(` const [oldestPoolBlock]: any[] = await DB.query(`
SELECT height SELECT height

19
backend/src/index.ts
View File

@ -36,7 +36,6 @@ import bitcoinRoutes from './api/bitcoin/bitcoin.routes';
import fundingTxFetcher from './tasks/lightning/sync-tasks/funding-tx-fetcher'; import fundingTxFetcher from './tasks/lightning/sync-tasks/funding-tx-fetcher';
import forensicsService from './tasks/lightning/forensics.service'; import forensicsService from './tasks/lightning/forensics.service';
import priceUpdater from './tasks/price-updater'; import priceUpdater from './tasks/price-updater';
import mining from './api/mining/mining';
import chainTips from './api/chain-tips'; import chainTips from './api/chain-tips';
import { AxiosError } from 'axios'; import { AxiosError } from 'axios';
@ -84,11 +83,8 @@ class Server {
if (config.DATABASE.ENABLED) { if (config.DATABASE.ENABLED) {
await DB.checkDbConnection(); await DB.checkDbConnection();
try { try {
if (process.env.npm_config_reindex !== undefined) { // Re-index requests if (process.env.npm_config_reindex_blocks === 'true') { // Re-index requests
const tables = process.env.npm_config_reindex.split(','); await databaseMigration.$blocksReindexingTruncate();
logger.warn(`Indexed data for "${process.env.npm_config_reindex}" tables will be erased in 5 seconds (using '--reindex')`);
await Common.sleep$(5000);
await databaseMigration.$truncateIndexedData(tables);
} }
await databaseMigration.$initializeOrMigrateDatabase(); await databaseMigration.$initializeOrMigrateDatabase();
if (Common.indexingEnabled()) { if (Common.indexingEnabled()) {
@ -183,7 +179,14 @@ class Server {
setTimeout(this.runMainUpdateLoop.bind(this), config.MEMPOOL.POLL_RATE_MS); setTimeout(this.runMainUpdateLoop.bind(this), config.MEMPOOL.POLL_RATE_MS);
this.currentBackendRetryInterval = 5; this.currentBackendRetryInterval = 5;
} catch (e: any) { } catch (e: any) {
const loggerMsg = `runMainLoop error: ${(e instanceof Error ? e.message : e)}. Retrying in ${this.currentBackendRetryInterval} sec.`; let loggerMsg = `Exception in runMainUpdateLoop(). Retrying in ${this.currentBackendRetryInterval} sec.`;
loggerMsg += ` Reason: ${(e instanceof Error ? e.message : e)}.`;
if (e?.stack) {
loggerMsg += ` Stack trace: ${e.stack}`;
}
// When we get a first Exception, only `logger.debug` it and retry after 5 seconds
// From the second Exception, `logger.warn` the Exception and increase the retry delay
// Maximum retry delay is 60 seconds
if (this.currentBackendRetryInterval > 5) { if (this.currentBackendRetryInterval > 5) {
logger.warn(loggerMsg); logger.warn(loggerMsg);
mempool.setOutOfSync(); mempool.setOutOfSync();
@ -203,8 +206,8 @@ class Server {
try { try {
await fundingTxFetcher.$init(); await fundingTxFetcher.$init();
await networkSyncService.$startService(); await networkSyncService.$startService();
await forensicsService.$startService();
await lightningStatsUpdater.$startService(); await lightningStatsUpdater.$startService();
await forensicsService.$startService();
} catch(e) { } catch(e) {
logger.err(`Nodejs lightning backend crashed. Restarting in 1 minute. Reason: ${(e instanceof Error ? e.message : e)}`); logger.err(`Nodejs lightning backend crashed. Restarting in 1 minute. Reason: ${(e instanceof Error ? e.message : e)}`);
await Common.sleep$(1000 * 60); await Common.sleep$(1000 * 60);

69
backend/src/mempool.interfaces.ts
View File

@ -1,9 +1,10 @@
import { IEsploraApi } from './api/bitcoin/esplora-api.interface'; import { IEsploraApi } from './api/bitcoin/esplora-api.interface';
import { OrphanedBlock } from './api/chain-tips'; import { OrphanedBlock } from './api/chain-tips';
import { HeapNode } from "./utils/pairing-heap"; import { HeapNode } from './utils/pairing-heap';
export interface PoolTag { export interface PoolTag {
id: number; // mysql row id id: number;
uniqueId: number;
name: string; name: string;
link: string; link: string;
regexes: string; // JSON array regexes: string; // JSON array
@ -147,44 +148,44 @@ export interface TransactionStripped {
} }
export interface BlockExtension { export interface BlockExtension {
totalFees?: number; totalFees: number;
medianFee?: number; medianFee: number; // median fee rate
feeRange?: number[]; feeRange: number[]; // fee rate percentiles
reward?: number; reward: number;
coinbaseTx?: TransactionMinerInfo; matchRate: number | null;
matchRate?: number; pool: {
pool?: { id: number; // Note - This is the `unique_id`, not to mix with the auto increment `id`
id: number;
name: string; name: string;
slug: string; slug: string;
}; };
avgFee?: number; avgFee: number;
avgFeeRate?: number; avgFeeRate: number;
coinbaseRaw?: string; coinbaseRaw: string;
usd?: number | null; orphans: OrphanedBlock[] | null;
medianTimestamp?: number; coinbaseAddress: string | null;
blockTime?: number; coinbaseSignature: string | null;
orphans?: OrphanedBlock[] | null; coinbaseSignatureAscii: string | null;
coinbaseAddress?: string | null; virtualSize: number;
coinbaseSignature?: string | null; avgTxSize: number;
coinbaseSignatureAscii?: string | null; totalInputs: number;
virtualSize?: number; totalOutputs: number;
avgTxSize?: number; totalOutputAmt: number;
totalInputs?: number; medianFeeAmt: number | null; // median fee in sats
totalOutputs?: number; feePercentiles: number[] | null, // fee percentiles in sats
totalOutputAmt?: number; segwitTotalTxs: number;
medianFeeAmt?: number | null; segwitTotalSize: number;
feePercentiles?: number[] | null, segwitTotalWeight: number;
segwitTotalTxs?: number; header: string;
segwitTotalSize?: number; utxoSetChange: number;
segwitTotalWeight?: number;
header?: string;
utxoSetChange?: number;
// Requires coinstatsindex, will be set to NULL otherwise // Requires coinstatsindex, will be set to NULL otherwise
utxoSetSize?: number | null; utxoSetSize: number | null;
totalInputAmt?: number | null; totalInputAmt: number | null;
} }
/**
* Note: Everything that is added in here will be automatically returned through
* /api/v1/block and /api/v1/blocks APIs
*/
export interface BlockExtended extends IEsploraApi.Block { export interface BlockExtended extends IEsploraApi.Block {
extras: BlockExtension; extras: BlockExtension;
} }

234
backend/src/repositories/BlocksRepository.ts
View File

@ -1,8 +1,7 @@
import { BlockExtended, BlockPrice } from '../mempool.interfaces'; import { BlockExtended, BlockExtension, BlockPrice } from '../mempool.interfaces';
import DB from '../database'; import DB from '../database';
import logger from '../logger'; import logger from '../logger';
import { Common } from '../api/common'; import { Common } from '../api/common';
import { prepareBlock } from '../utils/blocks-utils';
import PoolsRepository from './PoolsRepository'; import PoolsRepository from './PoolsRepository';
import HashratesRepository from './HashratesRepository'; import HashratesRepository from './HashratesRepository';
import { escape } from 'mysql2'; import { escape } from 'mysql2';
@ -10,12 +9,60 @@ import BlocksSummariesRepository from './BlocksSummariesRepository';
import DifficultyAdjustmentsRepository from './DifficultyAdjustmentsRepository'; import DifficultyAdjustmentsRepository from './DifficultyAdjustmentsRepository';
import bitcoinClient from '../api/bitcoin/bitcoin-client'; import bitcoinClient from '../api/bitcoin/bitcoin-client';
import config from '../config'; import config from '../config';
import chainTips from '../api/chain-tips';
import blocks from '../api/blocks';
import BlocksAuditsRepository from './BlocksAuditsRepository';
const BLOCK_DB_FIELDS = `
blocks.hash AS id,
blocks.height,
blocks.version,
UNIX_TIMESTAMP(blocks.blockTimestamp) AS timestamp,
blocks.bits,
blocks.nonce,
blocks.difficulty,
blocks.merkle_root,
blocks.tx_count,
blocks.size,
blocks.weight,
blocks.previous_block_hash AS previousblockhash,
UNIX_TIMESTAMP(blocks.median_timestamp) AS mediantime,
blocks.fees AS totalFees,
blocks.median_fee AS medianFee,
blocks.fee_span AS feeRange,
blocks.reward,
pools.unique_id AS poolId,
pools.name AS poolName,
pools.slug AS poolSlug,
blocks.avg_fee AS avgFee,
blocks.avg_fee_rate AS avgFeeRate,
blocks.coinbase_raw AS coinbaseRaw,
blocks.coinbase_address AS coinbaseAddress,
blocks.coinbase_signature AS coinbaseSignature,
blocks.coinbase_signature_ascii AS coinbaseSignatureAscii,
blocks.avg_tx_size AS avgTxSize,
blocks.total_inputs AS totalInputs,
blocks.total_outputs AS totalOutputs,
blocks.total_output_amt AS totalOutputAmt,
blocks.median_fee_amt AS medianFeeAmt,
blocks.fee_percentiles AS feePercentiles,
blocks.segwit_total_txs AS segwitTotalTxs,
blocks.segwit_total_size AS segwitTotalSize,
blocks.segwit_total_weight AS segwitTotalWeight,
blocks.header,
blocks.utxoset_change AS utxoSetChange,
blocks.utxoset_size AS utxoSetSize,
blocks.total_input_amt AS totalInputAmts
`;
class BlocksRepository { class BlocksRepository {
/** /**
* Save indexed block data in the database * Save indexed block data in the database
*/ */
public async $saveBlockInDatabase(block: BlockExtended) { public async $saveBlockInDatabase(block: BlockExtended) {
const truncatedCoinbaseSignature = block?.extras?.coinbaseSignature?.substring(0, 500);
const truncatedCoinbaseSignatureAscii = block?.extras?.coinbaseSignatureAscii?.substring(0, 500);
try { try {
const query = `INSERT INTO blocks( const query = `INSERT INTO blocks(
height, hash, blockTimestamp, size, height, hash, blockTimestamp, size,
@ -41,6 +88,11 @@ class BlocksRepository {
?, ? ?, ?
)`; )`;
const poolDbId = await PoolsRepository.$getPoolByUniqueId(block.extras.pool.id);
if (!poolDbId) {
throw Error(`Could not find a mining pool with the unique_id = ${block.extras.pool.id}. This error should never be printed.`);
}
const params: any[] = [ const params: any[] = [
block.height, block.height,
block.id, block.id,
@ -50,7 +102,7 @@ class BlocksRepository {
block.tx_count, block.tx_count,
block.extras.coinbaseRaw, block.extras.coinbaseRaw,
block.difficulty, block.difficulty,
block.extras.pool?.id, // Should always be set to something poolDbId.id,
block.extras.totalFees, block.extras.totalFees,
JSON.stringify(block.extras.feeRange), JSON.stringify(block.extras.feeRange),
block.extras.medianFee, block.extras.medianFee,
@ -62,10 +114,10 @@ class BlocksRepository {
block.previousblockhash, block.previousblockhash,
block.extras.avgFee, block.extras.avgFee,
block.extras.avgFeeRate, block.extras.avgFeeRate,
block.extras.medianTimestamp, block.mediantime,
block.extras.header, block.extras.header,
block.extras.coinbaseAddress, block.extras.coinbaseAddress,
block.extras.coinbaseSignature, truncatedCoinbaseSignature,
block.extras.utxoSetSize, block.extras.utxoSetSize,
block.extras.utxoSetChange, block.extras.utxoSetChange,
block.extras.avgTxSize, block.extras.avgTxSize,
@ -78,15 +130,15 @@ class BlocksRepository {
block.extras.segwitTotalSize, block.extras.segwitTotalSize,
block.extras.segwitTotalWeight, block.extras.segwitTotalWeight,
block.extras.medianFeeAmt, block.extras.medianFeeAmt,
block.extras.coinbaseSignatureAscii, truncatedCoinbaseSignatureAscii,
]; ];
await DB.query(query, params); await DB.query(query, params);
} catch (e: any) { } catch (e: any) {
if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart
logger.debug(`$saveBlockInDatabase() - Block ${block.height} has already been indexed, ignoring`); logger.debug(`$saveBlockInDatabase() - Block ${block.height} has already been indexed, ignoring`, logger.tags.mining);
} else { } else {
logger.err('Cannot save indexed block into db. Reason: ' + (e instanceof Error ? e.message : e)); logger.err('Cannot save indexed block into db. Reason: ' + (e instanceof Error ? e.message : e), logger.tags.mining);
throw e; throw e;
} }
} }
@ -304,34 +356,17 @@ class BlocksRepository {
/** /**
* Get blocks mined by a specific mining pool * Get blocks mined by a specific mining pool
*/ */
public async $getBlocksByPool(slug: string, startHeight?: number): Promise<object[]> { public async $getBlocksByPool(slug: string, startHeight?: number): Promise<BlockExtended[]> {
const pool = await PoolsRepository.$getPool(slug); const pool = await PoolsRepository.$getPool(slug);
if (!pool) { if (!pool) {
throw new Error('This mining pool does not exist ' + escape(slug)); throw new Error('This mining pool does not exist ' + escape(slug));
} }
const params: any[] = []; const params: any[] = [];
let query = ` SELECT let query = `
blocks.height, SELECT ${BLOCK_DB_FIELDS}
hash as id,
UNIX_TIMESTAMP(blocks.blockTimestamp) as blockTimestamp,
size,
weight,
tx_count,
coinbase_raw,
difficulty,
fees,
fee_span,
median_fee,
reward,
version,
bits,
nonce,
merkle_root,
previous_block_hash as previousblockhash,
avg_fee,
avg_fee_rate
FROM blocks FROM blocks
JOIN pools ON blocks.pool_id = pools.id
WHERE pool_id = ?`; WHERE pool_id = ?`;
params.push(pool.id); params.push(pool.id);
@ -344,11 +379,11 @@ class BlocksRepository {
LIMIT 10`; LIMIT 10`;
try { try {
const [rows] = await DB.query(query, params); const [rows]: any[] = await DB.query(query, params);
const blocks: BlockExtended[] = []; const blocks: BlockExtended[] = [];
for (const block of <object[]>rows) { for (const block of rows) {
blocks.push(prepareBlock(block)); blocks.push(await this.formatDbBlockIntoExtendedBlock(block));
} }
return blocks; return blocks;
@ -361,32 +396,21 @@ class BlocksRepository {
/** /**
* Get one block by height * Get one block by height
*/ */
public async $getBlockByHeight(height: number): Promise<object | null> { public async $getBlockByHeight(height: number): Promise<BlockExtended | null> {
try { try {
const [rows]: any[] = await DB.query(`SELECT const [rows]: any[] = await DB.query(`
blocks.*, SELECT ${BLOCK_DB_FIELDS}
hash as id,
UNIX_TIMESTAMP(blocks.blockTimestamp) as blockTimestamp,
UNIX_TIMESTAMP(blocks.median_timestamp) as medianTime,
pools.id as pool_id,
pools.name as pool_name,
pools.link as pool_link,
pools.slug as pool_slug,
pools.addresses as pool_addresses,
pools.regexes as pool_regexes,
previous_block_hash as previousblockhash
FROM blocks FROM blocks
JOIN pools ON blocks.pool_id = pools.id JOIN pools ON blocks.pool_id = pools.id
WHERE blocks.height = ${height} WHERE blocks.height = ?`,
`); [height]
);
if (rows.length <= 0) { if (rows.length <= 0) {
return null; return null;
} }
rows[0].fee_span = JSON.parse(rows[0].fee_span); return await this.formatDbBlockIntoExtendedBlock(rows[0]);
rows[0].fee_percentiles = JSON.parse(rows[0].fee_percentiles);
return rows[0];
} catch (e) { } catch (e) {
logger.err(`Cannot get indexed block ${height}. Reason: ` + (e instanceof Error ? e.message : e)); logger.err(`Cannot get indexed block ${height}. Reason: ` + (e instanceof Error ? e.message : e));
throw e; throw e;
@ -399,10 +423,7 @@ class BlocksRepository {
public async $getBlockByHash(hash: string): Promise<object | null> { public async $getBlockByHash(hash: string): Promise<object | null> {
try { try {
const query = ` const query = `
SELECT *, blocks.height, UNIX_TIMESTAMP(blocks.blockTimestamp) as blockTimestamp, hash as id, SELECT ${BLOCK_DB_FIELDS}
pools.id as pool_id, pools.name as pool_name, pools.link as pool_link, pools.slug as pool_slug,
pools.addresses as pool_addresses, pools.regexes as pool_regexes,
previous_block_hash as previousblockhash
FROM blocks FROM blocks
JOIN pools ON blocks.pool_id = pools.id JOIN pools ON blocks.pool_id = pools.id
WHERE hash = ?; WHERE hash = ?;
@ -412,9 +433,8 @@ class BlocksRepository {
if (rows.length <= 0) { if (rows.length <= 0) {
return null; return null;
} }
rows[0].fee_span = JSON.parse(rows[0].fee_span); return await this.formatDbBlockIntoExtendedBlock(rows[0]);
return rows[0];
} catch (e) { } catch (e) {
logger.err(`Cannot get indexed block ${hash}. Reason: ` + (e instanceof Error ? e.message : e)); logger.err(`Cannot get indexed block ${hash}. Reason: ` + (e instanceof Error ? e.message : e));
throw e; throw e;
@ -505,8 +525,15 @@ class BlocksRepository {
public async $validateChain(): Promise<boolean> { public async $validateChain(): Promise<boolean> {
try { try {
const start = new Date().getTime(); const start = new Date().getTime();
const [blocks]: any[] = await DB.query(`SELECT height, hash, previous_block_hash, const [blocks]: any[] = await DB.query(`
UNIX_TIMESTAMP(blockTimestamp) as timestamp FROM blocks ORDER BY height`); SELECT
height,
hash,
previous_block_hash,
UNIX_TIMESTAMP(blockTimestamp) AS timestamp
FROM blocks
ORDER BY height
`);
let partialMsg = false; let partialMsg = false;
let idx = 1; let idx = 1;
@ -830,6 +857,95 @@ class BlocksRepository {
throw e; throw e;
} }
} }
/**
* Convert a mysql row block into a BlockExtended. Note that you
* must provide the correct field into dbBlk object param
*
* @param dbBlk
*/
private async formatDbBlockIntoExtendedBlock(dbBlk: any): Promise<BlockExtended> {
const blk: Partial<BlockExtended> = {};
const extras: Partial<BlockExtension> = {};
// IEsploraApi.Block
blk.id = dbBlk.id;
blk.height = dbBlk.height;
blk.version = dbBlk.version;
blk.timestamp = dbBlk.timestamp;
blk.bits = dbBlk.bits;
blk.nonce = dbBlk.nonce;
blk.difficulty = dbBlk.difficulty;
blk.merkle_root = dbBlk.merkle_root;
blk.tx_count = dbBlk.tx_count;
blk.size = dbBlk.size;
blk.weight = dbBlk.weight;
blk.previousblockhash = dbBlk.previousblockhash;
blk.mediantime = dbBlk.mediantime;
// BlockExtension
extras.totalFees = dbBlk.totalFees;
extras.medianFee = dbBlk.medianFee;
extras.feeRange = JSON.parse(dbBlk.feeRange);
extras.reward = dbBlk.reward;
extras.pool = {
id: dbBlk.poolId,
name: dbBlk.poolName,
slug: dbBlk.poolSlug,
};
extras.avgFee = dbBlk.avgFee;
extras.avgFeeRate = dbBlk.avgFeeRate;
extras.coinbaseRaw = dbBlk.coinbaseRaw;
extras.coinbaseAddress = dbBlk.coinbaseAddress;
extras.coinbaseSignature = dbBlk.coinbaseSignature;
extras.coinbaseSignatureAscii = dbBlk.coinbaseSignatureAscii;
extras.avgTxSize = dbBlk.avgTxSize;
extras.totalInputs = dbBlk.totalInputs;
extras.totalOutputs = dbBlk.totalOutputs;
extras.totalOutputAmt = dbBlk.totalOutputAmt;
extras.medianFeeAmt = dbBlk.medianFeeAmt;
extras.feePercentiles = JSON.parse(dbBlk.feePercentiles);
extras.segwitTotalTxs = dbBlk.segwitTotalTxs;
extras.segwitTotalSize = dbBlk.segwitTotalSize;
extras.segwitTotalWeight = dbBlk.segwitTotalWeight;
extras.header = dbBlk.header,
extras.utxoSetChange = dbBlk.utxoSetChange;
extras.utxoSetSize = dbBlk.utxoSetSize;
extras.totalInputAmt = dbBlk.totalInputAmt;
extras.virtualSize = dbBlk.weight / 4.0;
// Re-org can happen after indexing so we need to always get the
// latest state from core
extras.orphans = chainTips.getOrphanedBlocksAtHeight(dbBlk.height);
// Match rate is not part of the blocks table, but it is part of APIs so we must include it
extras.matchRate = null;
if (config.MEMPOOL.AUDIT) {
const auditScore = await BlocksAuditsRepository.$getBlockAuditScore(dbBlk.id);
if (auditScore != null) {
extras.matchRate = auditScore.matchRate;
}
}
// If we're missing block summary related field, check if we can populate them on the fly now
if (Common.blocksSummariesIndexingEnabled() &&
(extras.medianFeeAmt === null || extras.feePercentiles === null))
{
extras.feePercentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(dbBlk.id);
if (extras.feePercentiles === null) {
const block = await bitcoinClient.getBlock(dbBlk.id, 2);
const summary = blocks.summarizeBlock(block);
await BlocksSummariesRepository.$saveSummary({ height: block.height, mined: summary });
extras.feePercentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(dbBlk.id);
}
if (extras.feePercentiles !== null) {
extras.medianFeeAmt = extras.feePercentiles[3];
}
}
blk.extras = <BlockExtension>extras;
return <BlockExtended>blk;
}
} }
export default new BlocksRepository(); export default new BlocksRepository();

8
backend/src/repositories/PoolsRepository.ts
View File

@ -10,7 +10,7 @@ class PoolsRepository {
* Get all pools tagging info * Get all pools tagging info
*/ */
public async $getPools(): Promise<PoolTag[]> { public async $getPools(): Promise<PoolTag[]> {
const [rows] = await DB.query('SELECT id, name, addresses, regexes, slug FROM pools;'); const [rows] = await DB.query('SELECT id, unique_id as uniqueId, name, addresses, regexes, slug FROM pools');
return <PoolTag[]>rows; return <PoolTag[]>rows;
} }
@ -18,10 +18,10 @@ class PoolsRepository {
* Get unknown pool tagging info * Get unknown pool tagging info
*/ */
public async $getUnknownPool(): Promise<PoolTag> { public async $getUnknownPool(): Promise<PoolTag> {
let [rows]: any[] = await DB.query('SELECT id, name, slug FROM pools where name = "Unknown"'); let [rows]: any[] = await DB.query('SELECT id, unique_id as uniqueId, name, slug FROM pools where name = "Unknown"');
if (rows && rows.length === 0 && config.DATABASE.ENABLED) { if (rows && rows.length === 0 && config.DATABASE.ENABLED) {
await poolsParser.$insertUnknownPool(); await poolsParser.$insertUnknownPool();
[rows] = await DB.query('SELECT id, name, slug FROM pools where name = "Unknown"'); [rows] = await DB.query('SELECT id, unique_id as uniqueId, name, slug FROM pools where name = "Unknown"');
} }
return <PoolTag>rows[0]; return <PoolTag>rows[0];
} }
@ -99,7 +99,7 @@ class PoolsRepository {
rows[0].regexes = JSON.parse(rows[0].regexes); rows[0].regexes = JSON.parse(rows[0].regexes);
} }
if (['testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) { if (['testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) {
rows[0].addresses = []; // pools.json only contains mainnet addresses rows[0].addresses = []; // pools-v2.json only contains mainnet addresses
} else if (parse) { } else if (parse) {
rows[0].addresses = JSON.parse(rows[0].addresses); rows[0].addresses = JSON.parse(rows[0].addresses);
} }

2
backend/src/repositories/PricesRepository.ts
View File

@ -40,7 +40,7 @@ export const MAX_PRICES = {
class PricesRepository { class PricesRepository {
public async $savePrices(time: number, prices: IConversionRates): Promise<void> { public async $savePrices(time: number, prices: IConversionRates): Promise<void> {
if (prices.USD === 0) { if (prices.USD === -1) {
// Some historical price entries have no USD prices, so we just ignore them to avoid future UX issues // Some historical price entries have no USD prices, so we just ignore them to avoid future UX issues
// As of today there are only 4 (on 2013-09-05, 2013-0909, 2013-09-12 and 2013-09-26) so that's fine // As of today there are only 4 (on 2013-09-05, 2013-0909, 2013-09-12 and 2013-09-26) so that's fine
return; return;

2
backend/src/tasks/lightning/network-sync.service.ts
View File

@ -72,7 +72,7 @@ class NetworkSyncService {
const graphNodesPubkeys: string[] = []; const graphNodesPubkeys: string[] = [];
for (const node of nodes) { for (const node of nodes) {
const latestUpdated = await channelsApi.$getLatestChannelUpdateForNode(node.pub_key); const latestUpdated = await channelsApi.$getLatestChannelUpdateForNode(node.pub_key);
node.last_update = Math.max(node.last_update, latestUpdated); node.last_update = Math.max(node.last_update ?? 0, latestUpdated);
await nodesApi.$saveNode(node); await nodesApi.$saveNode(node);
graphNodesPubkeys.push(node.pub_key); graphNodesPubkeys.push(node.pub_key);

26
backend/src/tasks/pools-updater.ts
View File

@ -17,11 +17,6 @@ class PoolsUpdater {
treeUrl: string = config.MEMPOOL.POOLS_JSON_TREE_URL; treeUrl: string = config.MEMPOOL.POOLS_JSON_TREE_URL;
public async updatePoolsJson(): Promise<void> { public async updatePoolsJson(): Promise<void> {
if (config.MEMPOOL.AUTOMATIC_BLOCK_REINDEXING === false) {
logger.info(`Not updating mining pools to avoid inconsistency because AUTOMATIC_BLOCK_REINDEXING is set to false`)
return;
}
if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) { if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) {
return; return;
} }
@ -36,12 +31,6 @@ class PoolsUpdater {
this.lastRun = now; this.lastRun = now;
if (config.SOCKS5PROXY.ENABLED) {
logger.info(`Updating latest mining pools from ${this.poolsUrl} over the Tor network`, logger.tags.mining);
} else {
logger.info(`Updating latest mining pools from ${this.poolsUrl} over clearnet`, logger.tags.mining);
}
try { try {
const githubSha = await this.fetchPoolsSha(); // Fetch pools-v2.json sha from github const githubSha = await this.fetchPoolsSha(); // Fetch pools-v2.json sha from github
if (githubSha === undefined) { if (githubSha === undefined) {
@ -57,10 +46,21 @@ class PoolsUpdater {
return; return;
} }
// See backend README for more details about the mining pools update process
if (this.currentSha !== undefined && // If we don't have any mining pool, download it at least once
config.MEMPOOL.AUTOMATIC_BLOCK_REINDEXING !== true && // Automatic pools update is disabled
!process.env.npm_config_update_pools // We're not manually updating mining pool
) {
logger.warn(`Updated mining pools data is available (${githubSha}) but AUTOMATIC_BLOCK_REINDEXING is disabled`);
logger.info(`You can update your mining pools using the --update-pools command flag. You may want to clear your nginx cache as well if applicable`);
return;
}
const network = config.SOCKS5PROXY.ENABLED ? 'tor' : 'clearnet';
if (this.currentSha === undefined) { if (this.currentSha === undefined) {
logger.info(`Downloading pools-v2.json for the first time from ${this.poolsUrl}`, logger.tags.mining); logger.info(`Downloading pools-v2.json for the first time from ${this.poolsUrl} over ${network}`, logger.tags.mining);
} else { } else {
logger.warn(`pools-v2.json is outdated, fetch latest from ${this.poolsUrl}`, logger.tags.mining); logger.warn(`pools-v2.json is outdated, fetch latest from ${this.poolsUrl} over ${network}`, logger.tags.mining);
} }
const poolsJson = await this.query(this.poolsUrl); const poolsJson = await this.query(this.poolsUrl);
if (poolsJson === undefined) { if (poolsJson === undefined) {

33
backend/src/utils/blocks-utils.ts
View File

@ -1,33 +0,0 @@
import { BlockExtended } from '../mempool.interfaces';
export function prepareBlock(block: any): BlockExtended {
return <BlockExtended>{
id: block.id ?? block.hash, // hash for indexed block
timestamp: block.timestamp ?? block.time ?? block.blockTimestamp, // blockTimestamp for indexed block
height: block.height,
version: block.version,
bits: (typeof block.bits === 'string' ? parseInt(block.bits, 16): block.bits),
nonce: block.nonce,
difficulty: block.difficulty,
merkle_root: block.merkle_root ?? block.merkleroot,
tx_count: block.tx_count ?? block.nTx,
size: block.size,
weight: block.weight,
previousblockhash: block.previousblockhash,
extras: {
coinbaseRaw: block.coinbase_raw ?? block.extras?.coinbaseRaw,
medianFee: block.medianFee ?? block.median_fee ?? block.extras?.medianFee,
feeRange: block.feeRange ?? block?.extras?.feeRange ?? block.fee_span,
reward: block.reward ?? block?.extras?.reward,
totalFees: block.totalFees ?? block?.fees ?? block?.extras?.totalFees,
avgFee: block?.extras?.avgFee ?? block.avg_fee,
avgFeeRate: block?.avgFeeRate ?? block.avg_fee_rate,
pool: block?.extras?.pool ?? (block?.pool_id ? {
id: block.pool_id,
name: block.pool_name,
slug: block.pool_slug,
} : undefined),
usd: block?.extras?.usd ?? block.usd ?? null,
}
};
}

4
docker/README.md
View File

@ -102,11 +102,11 @@ Below we list all settings from `mempool-config.json` and the corresponding over
"MEMPOOL_BLOCKS_AMOUNT": 8, "MEMPOOL_BLOCKS_AMOUNT": 8,
"BLOCKS_SUMMARIES_INDEXING": false, "BLOCKS_SUMMARIES_INDEXING": false,
"USE_SECOND_NODE_FOR_MINFEE": false, "USE_SECOND_NODE_FOR_MINFEE": false,
"EXTERNAL_ASSETS": ["https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json"], "EXTERNAL_ASSETS": [],
"STDOUT_LOG_MIN_PRIORITY": "info", "STDOUT_LOG_MIN_PRIORITY": "info",
"INDEXING_BLOCKS_AMOUNT": false, "INDEXING_BLOCKS_AMOUNT": false,
"AUTOMATIC_BLOCK_REINDEXING": false, "AUTOMATIC_BLOCK_REINDEXING": false,
"POOLS_JSON_URL": "https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json", "POOLS_JSON_URL": "https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json",
"POOLS_JSON_TREE_URL": "https://api.github.com/repos/mempool/mining-pools/git/trees/master", "POOLS_JSON_TREE_URL": "https://api.github.com/repos/mempool/mining-pools/git/trees/master",
"ADVANCED_GBT_AUDIT": false, "ADVANCED_GBT_AUDIT": false,
"ADVANCED_GBT_MEMPOOL": false, "ADVANCED_GBT_MEMPOOL": false,

2
docker/backend/start.sh
View File

@ -24,7 +24,7 @@ __MEMPOOL_USER_AGENT__=${MEMPOOL_USER_AGENT:=mempool}
__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__=${MEMPOOL_STDOUT_LOG_MIN_PRIORITY:=info} __MEMPOOL_STDOUT_LOG_MIN_PRIORITY__=${MEMPOOL_STDOUT_LOG_MIN_PRIORITY:=info}
__MEMPOOL_INDEXING_BLOCKS_AMOUNT__=${MEMPOOL_INDEXING_BLOCKS_AMOUNT:=false} __MEMPOOL_INDEXING_BLOCKS_AMOUNT__=${MEMPOOL_INDEXING_BLOCKS_AMOUNT:=false}
__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__=${MEMPOOL_AUTOMATIC_BLOCK_REINDEXING:=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.json} __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} __MEMPOOL_POOLS_JSON_TREE_URL__=${MEMPOOL_POOLS_JSON_TREE_URL:=https://api.github.com/repos/mempool/mining-pools/git/trees/master}
__MEMPOOL_AUDIT__=${MEMPOOL_AUDIT:=false} __MEMPOOL_AUDIT__=${MEMPOOL_AUDIT:=false}
__MEMPOOL_ADVANCED_GBT_AUDIT__=${MEMPOOL_ADVANCED_GBT_AUDIT:=false} __MEMPOOL_ADVANCED_GBT_AUDIT__=${MEMPOOL_ADVANCED_GBT_AUDIT:=false}

2
docker/frontend/entrypoint.sh
View File

@ -35,6 +35,7 @@ __AUDIT__=${AUDIT:=false}
__MAINNET_BLOCK_AUDIT_START_HEIGHT__=${MAINNET_BLOCK_AUDIT_START_HEIGHT:=0} __MAINNET_BLOCK_AUDIT_START_HEIGHT__=${MAINNET_BLOCK_AUDIT_START_HEIGHT:=0}
__TESTNET_BLOCK_AUDIT_START_HEIGHT__=${TESTNET_BLOCK_AUDIT_START_HEIGHT:=0} __TESTNET_BLOCK_AUDIT_START_HEIGHT__=${TESTNET_BLOCK_AUDIT_START_HEIGHT:=0}
__SIGNET_BLOCK_AUDIT_START_HEIGHT__=${SIGNET_BLOCK_AUDIT_START_HEIGHT:=0} __SIGNET_BLOCK_AUDIT_START_HEIGHT__=${SIGNET_BLOCK_AUDIT_START_HEIGHT:=0}
__HISTORICAL_PRICE__=${HISTORICAL_PRICE:=true}
# Export as environment variables to be used by envsubst # Export as environment variables to be used by envsubst
export __TESTNET_ENABLED__ export __TESTNET_ENABLED__
@ -60,6 +61,7 @@ export __AUDIT__
export __MAINNET_BLOCK_AUDIT_START_HEIGHT__ export __MAINNET_BLOCK_AUDIT_START_HEIGHT__
export __TESTNET_BLOCK_AUDIT_START_HEIGHT__ export __TESTNET_BLOCK_AUDIT_START_HEIGHT__
export __SIGNET_BLOCK_AUDIT_START_HEIGHT__ export __SIGNET_BLOCK_AUDIT_START_HEIGHT__
export __HISTORICAL_PRICE__
folder=$(find /var/www/mempool -name "config.js" | xargs dirname) folder=$(find /var/www/mempool -name "config.js" | xargs dirname)
echo ${folder} echo ${folder}

3
frontend/mempool-frontend-config.sample.json
View File

@ -21,5 +21,6 @@
"MAINNET_BLOCK_AUDIT_START_HEIGHT": 0, "MAINNET_BLOCK_AUDIT_START_HEIGHT": 0,
"TESTNET_BLOCK_AUDIT_START_HEIGHT": 0, "TESTNET_BLOCK_AUDIT_START_HEIGHT": 0,
"SIGNET_BLOCK_AUDIT_START_HEIGHT": 0, "SIGNET_BLOCK_AUDIT_START_HEIGHT": 0,
"LIGHTNING": false "LIGHTNING": false,
"HISTORICAL_PRICE": true
} }

39
frontend/src/app/components/about/about.component.html
View File

@ -13,19 +13,9 @@
<p i18n>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.</p> <p i18n>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.</p>
</div> </div>
<div class="social-icons"> <video src="/resources/mempool-promo.mp4" poster="/resources/mempool-promo.jpg" controls loop playsinline [autoplay]="true" [muted]="true"></video>
<a target="_blank" href="https://github.com/mempool/mempool">
<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="github" class="svg-inline--fa fa-github fa-w-16 fa-4x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path fill="currentColor" d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"></path></svg>
</a>
<a target="_blank" href="https://twitter.com/mempool">
<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="twitter" class="svg-inline--fa fa-twitter fa-w-16 fa-4x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"></path></svg>
</a>
<a target="_blank" href="https://matrix.to/#/#mempool:bitcoin.kyoto">
<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="matrix" class="svg-inline--fa fa-matrix fa-w-16 fa-4x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1536 1792"><path fill="currentColor" d="M40.467 163.152v1465.696H145.92V1664H0V128h145.92v35.152zm450.757 464.64v74.14h2.069c19.79-28.356 43.717-50.215 71.483-65.575 27.765-15.656 59.963-23.336 96-23.336 34.56 0 66.165 6.795 94.818 20.086 28.652 13.293 50.216 37.22 65.28 70.893 16.246-23.926 38.4-45.194 66.166-63.507 27.766-18.314 60.848-27.472 98.954-27.472 28.948 0 55.828 3.545 80.64 10.635 24.812 7.088 45.785 18.314 63.508 33.968 17.722 15.656 31.31 35.742 41.354 60.85 9.747 25.107 14.768 55.236 14.768 90.683v366.573h-150.35V865.28c0-18.314-.59-35.741-2.068-51.987-1.476-16.247-5.316-30.426-11.52-42.24-6.499-12.112-15.656-21.563-28.062-28.653-12.405-7.088-29.242-10.634-50.214-10.634-21.268 0-38.4 4.135-51.397 12.112-12.997 8.27-23.336 18.608-30.72 31.901-7.386 12.997-12.407 27.765-14.77 44.602-2.363 16.542-3.84 33.379-3.84 50.216v305.133H692.971v-307.2c0-16.247-.294-32.197-1.18-48.149-.591-15.95-3.84-30.424-9.157-44.011-5.317-13.293-14.178-24.223-26.585-32.197-12.406-7.976-30.425-12.112-54.646-12.112-7.088 0-16.542 1.478-28.062 4.726-11.52 3.25-23.04 9.157-33.968 18.02-10.93 8.86-20.383 21.563-28.063 38.103-7.68 16.543-11.52 38.4-11.52 65.28v317.834H349.44V627.792zm1004.309 1001.056V163.152H1390.08V128H1536v1536h-145.92v-35.152z"/></svg>
</a>
</div>
<div class="enterprise-sponsor"> <div class="enterprise-sponsor" id="enterprise-sponsors">
<h3 i18n="about.sponsors.enterprise.withRocket">Enterprise Sponsors 🚀</h3> <h3 i18n="about.sponsors.enterprise.withRocket">Enterprise Sponsors 🚀</h3>
<div class="wrapper"> <div class="wrapper">
<a href="https://spiral.xyz/" target="_blank" title="Spiral"> <a href="https://spiral.xyz/" target="_blank" title="Spiral">
@ -173,7 +163,7 @@
</div> </div>
</div> </div>
<div class="community-sponsor"> <div class="community-sponsor" id="community-sponsors">
<h3 i18n="about.sponsors.withHeart">Community Sponsors ❤️</h3> <h3 i18n="about.sponsors.withHeart">Community Sponsors ❤️</h3>
<div class="wrapper"> <div class="wrapper">
@ -187,7 +177,7 @@
</div> </div>
</div> </div>
<div class="community-integrations-sponsor"> <div class="community-integrations-sponsor" id="community-integrations">
<h3 i18n="about.community-integrations">Community Integrations</h3> <h3 i18n="about.community-integrations">Community Integrations</h3>
<div class="wrapper"> <div class="wrapper">
<a href="https://github.com/getumbrel/umbrel" target="_blank" title="Umbrel"> <a href="https://github.com/getumbrel/umbrel" target="_blank" title="Umbrel">
@ -281,7 +271,7 @@
</div> </div>
</div> </div>
<div class="alliances"> <div class="alliances" id="community-alliances">
<h3 i18n="about.alliances">Community Alliances</h3> <h3 i18n="about.alliances">Community Alliances</h3>
<div class="wrapper"> <div class="wrapper">
<a href="https://liquid.net/" title="Liquid Network"> <a href="https://liquid.net/" title="Liquid Network">
@ -297,7 +287,7 @@
</div> </div>
<ng-container *ngIf="translators$ | async | keyvalue as translators else loadingSponsors"> <ng-container *ngIf="translators$ | async | keyvalue as translators else loadingSponsors">
<div class="project-translators"> <div class="project-translators" id="project-translators">
<h3 i18n="about.translators">Project Translators</h3> <h3 i18n="about.translators">Project Translators</h3>
<div class="wrapper"> <div class="wrapper">
<ng-template ngFor let-translator [ngForOf]="translators"> <ng-template ngFor let-translator [ngForOf]="translators">
@ -311,7 +301,7 @@
</ng-container> </ng-container>
<ng-container *ngIf="allContributors$ | async as contributors else loadingSponsors"> <ng-container *ngIf="allContributors$ | async as contributors else loadingSponsors">
<div class="contributors"> <div class="contributors" id="project-contributors">
<h3 i18n="about.contributors">Project Contributors</h3> <h3 i18n="about.contributors">Project Contributors</h3>
<div class="wrapper"> <div class="wrapper">
<ng-template ngFor let-contributor [ngForOf]="contributors.regular"> <ng-template ngFor let-contributor [ngForOf]="contributors.regular">
@ -323,7 +313,7 @@
</div> </div>
</div> </div>
<div class="maintainers" *ngIf="contributors.core.length"> <div class="maintainers" *ngIf="contributors.core.length" id="project-members">
<h3 i18n="about.project_members">Project Members</h3> <h3 i18n="about.project_members">Project Members</h3>
<div class="wrapper"> <div class="wrapper">
<ng-template ngFor let-contributor [ngForOf]="contributors.core"> <ng-template ngFor let-contributor [ngForOf]="contributors.core">
@ -336,7 +326,7 @@
</div> </div>
</ng-container> </ng-container>
<div class="maintainers"> <div class="maintainers" id="project-maintainers">
<h3 i18n="about.maintainers">Project Maintainers</h3> <h3 i18n="about.maintainers">Project Maintainers</h3>
<div class="wrapper"> <div class="wrapper">
<a href="https://twitter.com/softsimon_" target="_blank" title="softsimon"> <a href="https://twitter.com/softsimon_" target="_blank" title="softsimon">
@ -383,6 +373,17 @@
<div class="footer-links"> <div class="footer-links">
<a href="/3rdpartylicenses.txt">Third-party Licenses</a> <a href="/3rdpartylicenses.txt">Third-party Licenses</a>
<a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a> <a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
<div class="social-icons">
<a target="_blank" href="https://github.com/mempool/mempool">
<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="github" class="svg-inline--fa fa-github fa-w-16 fa-2x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path fill="currentColor" d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"></path></svg>
</a>
<a target="_blank" href="https://twitter.com/mempool">
<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="twitter" class="svg-inline--fa fa-twitter fa-w-16 fa-2x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"></path></svg>
</a>
<a target="_blank" href="https://matrix.to/#/#mempool:bitcoin.kyoto">
<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="matrix" class="svg-inline--fa fa-matrix fa-w-16 fa-2x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1536 1792"><path fill="currentColor" d="M40.467 163.152v1465.696H145.92V1664H0V128h145.92v35.152zm450.757 464.64v74.14h2.069c19.79-28.356 43.717-50.215 71.483-65.575 27.765-15.656 59.963-23.336 96-23.336 34.56 0 66.165 6.795 94.818 20.086 28.652 13.293 50.216 37.22 65.28 70.893 16.246-23.926 38.4-45.194 66.166-63.507 27.766-18.314 60.848-27.472 98.954-27.472 28.948 0 55.828 3.545 80.64 10.635 24.812 7.088 45.785 18.314 63.508 33.968 17.722 15.656 31.31 35.742 41.354 60.85 9.747 25.107 14.768 55.236 14.768 90.683v366.573h-150.35V865.28c0-18.314-.59-35.741-2.068-51.987-1.476-16.247-5.316-30.426-11.52-42.24-6.499-12.112-15.656-21.563-28.062-28.653-12.405-7.088-29.242-10.634-50.214-10.634-21.268 0-38.4 4.135-51.397 12.112-12.997 8.27-23.336 18.608-30.72 31.901-7.386 12.997-12.407 27.765-14.77 44.602-2.363 16.542-3.84 33.379-3.84 50.216v305.133H692.971v-307.2c0-16.247-.294-32.197-1.18-48.149-.591-15.95-3.84-30.424-9.157-44.011-5.317-13.293-14.178-24.223-26.585-32.197-12.406-7.976-30.425-12.112-54.646-12.112-7.088 0-16.542 1.478-28.062 4.726-11.52 3.25-23.04 9.157-33.968 18.02-10.93 8.86-20.383 21.563-28.063 38.103-7.68 16.543-11.52 38.4-11.52 65.28v317.834H349.44V627.792zm1004.309 1001.056V163.152H1390.08V128H1536v1536h-145.92v-35.152z"/></svg>
</a>
</div>
</div> </div>
<div class="footer-version" *ngIf="officialMempoolSpace"> <div class="footer-version" *ngIf="officialMempoolSpace">

13
frontend/src/app/components/about/about.component.scss
View File

@ -34,6 +34,12 @@
padding: 10px 15px 15px; padding: 10px 15px 15px;
} }
video {
width: 640px;
max-width: 90%;
margin-top: 0;
}
.social-icons { .social-icons {
a { a {
margin: auto 10px; margin: auto 10px;
@ -46,6 +52,7 @@
.maintainers { .maintainers {
margin-top: 68px; margin-top: 68px;
margin-bottom: 68px; margin-bottom: 68px;
scroll-margin: 30px;
} }
.maintainers { .maintainers {
@ -117,6 +124,7 @@
.project-translators, .project-translators,
.community-integrations-sponsor, .community-integrations-sponsor,
.maintainers { .maintainers {
scroll-margin: 30px;
.wrapper { .wrapper {
display: inline-block; display: inline-block;
a { a {
@ -186,6 +194,11 @@
margin: 20px auto 30px; margin: 20px auto 30px;
} }
} }
.social-icons {
a {
margin: 45px 10px;
}
}
} }
.footer-version { .footer-version {

34
frontend/src/app/components/about/about.component.ts
View File

@ -5,9 +5,10 @@ import { StateService } from '../../services/state.service';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { ApiService } from '../../services/api.service'; import { ApiService } from '../../services/api.service';
import { IBackendInfo } from '../../interfaces/websocket.interface'; import { IBackendInfo } from '../../interfaces/websocket.interface';
import { Router } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
import { map } from 'rxjs/operators'; import { map, tap } from 'rxjs/operators';
import { ITranslators } from '../../interfaces/node-api.interface'; import { ITranslators } from '../../interfaces/node-api.interface';
import { DOCUMENT } from '@angular/common';
@Component({ @Component({
selector: 'app-about', selector: 'app-about',
@ -31,7 +32,9 @@ export class AboutComponent implements OnInit {
public stateService: StateService, public stateService: StateService,
private apiService: ApiService, private apiService: ApiService,
private router: Router, private router: Router,
private route: ActivatedRoute,
@Inject(LOCALE_ID) public locale: string, @Inject(LOCALE_ID) public locale: string,
@Inject(DOCUMENT) private document: Document,
) { } ) { }
ngOnInit() { ngOnInit() {
@ -39,17 +42,21 @@ export class AboutComponent implements OnInit {
this.seoService.setTitle($localize`:@@004b222ff9ef9dd4771b777950ca1d0e4cd4348a:About`); this.seoService.setTitle($localize`:@@004b222ff9ef9dd4771b777950ca1d0e4cd4348a:About`);
this.websocketService.want(['blocks']); this.websocketService.want(['blocks']);
this.sponsors$ = this.apiService.getDonation$(); this.sponsors$ = this.apiService.getDonation$()
.pipe(
tap(() => this.goToAnchor())
);
this.translators$ = this.apiService.getTranslators$() this.translators$ = this.apiService.getTranslators$()
.pipe( .pipe(
map((translators) => { map((translators) => {
for (const t in translators) { for (const t in translators) {
if (translators[t] === '') { if (translators[t] === '') {
delete translators[t] delete translators[t];
} }
} }
return translators; return translators;
}) }),
tap(() => this.goToAnchor())
); );
this.allContributors$ = this.apiService.getContributor$().pipe( this.allContributors$ = this.apiService.getContributor$().pipe(
map((contributors) => { map((contributors) => {
@ -57,9 +64,24 @@ export class AboutComponent implements OnInit {
regular: contributors.filter((user) => !user.core_constributor), regular: contributors.filter((user) => !user.core_constributor),
core: contributors.filter((user) => user.core_constributor), core: contributors.filter((user) => user.core_constributor),
}; };
}) }),
tap(() => this.goToAnchor())
); );
} }
ngAfterViewInit() {
this.goToAnchor();
}
goToAnchor() {
setTimeout(() => {
if (this.route.snapshot.fragment) {
if (this.document.getElementById(this.route.snapshot.fragment)) {
this.document.getElementById(this.route.snapshot.fragment).scrollIntoView({behavior: 'smooth'});
}
}
}, 1);
}
sponsor(): void { sponsor(): void {
if (this.officialMempoolSpace && this.stateService.env.BASE_MODULE === 'mempool') { if (this.officialMempoolSpace && this.stateService.env.BASE_MODULE === 'mempool') {

2
frontend/src/app/components/amount/amount.component.ts
View File

@ -1,7 +1,7 @@
import { Component, OnInit, OnDestroy, Input, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'; import { Component, OnInit, OnDestroy, Input, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core';
import { StateService } from '../../services/state.service'; import { StateService } from '../../services/state.service';
import { Observable, Subscription } from 'rxjs'; import { Observable, Subscription } from 'rxjs';
import { Price } from 'src/app/services/price.service'; import { Price } from '../../services/price.service';
@Component({ @Component({
selector: 'app-amount', selector: 'app-amount',

2
frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts
View File

@ -5,7 +5,7 @@ import BlockScene from './block-scene';
import TxSprite from './tx-sprite'; import TxSprite from './tx-sprite';
import TxView from './tx-view'; import TxView from './tx-view';
import { Position } from './sprite-types'; import { Position } from './sprite-types';
import { Price } from 'src/app/services/price.service'; import { Price } from '../../services/price.service';
@Component({ @Component({
selector: 'app-block-overview-graph', selector: 'app-block-overview-graph',

2
frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.ts
View File

@ -1,7 +1,7 @@
import { Component, ElementRef, ViewChild, Input, OnChanges, ChangeDetectionStrategy } from '@angular/core'; import { Component, ElementRef, ViewChild, Input, OnChanges, ChangeDetectionStrategy } from '@angular/core';
import { TransactionStripped } from '../../interfaces/websocket.interface'; import { TransactionStripped } from '../../interfaces/websocket.interface';
import { Position } from '../../components/block-overview-graph/sprite-types.js'; import { Position } from '../../components/block-overview-graph/sprite-types.js';
import { Price } from 'src/app/services/price.service'; import { Price } from '../../services/price.service';
@Component({ @Component({
selector: 'app-block-overview-tooltip', selector: 'app-block-overview-tooltip',

2
frontend/src/app/components/block/block.component.ts
View File

@ -13,7 +13,7 @@ import { BlockAudit, BlockExtended, TransactionStripped } from '../../interfaces
import { ApiService } from '../../services/api.service'; import { ApiService } from '../../services/api.service';
import { BlockOverviewGraphComponent } from '../../components/block-overview-graph/block-overview-graph.component'; import { BlockOverviewGraphComponent } from '../../components/block-overview-graph/block-overview-graph.component';
import { detectWebGL } from '../../shared/graphs.utils'; import { detectWebGL } from '../../shared/graphs.utils';
import { PriceService, Price } from 'src/app/services/price.service'; import { PriceService, Price } from '../../services/price.service';
@Component({ @Component({
selector: 'app-block', selector: 'app-block',

1
frontend/src/app/components/start/start.component.ts
View File

@ -267,6 +267,7 @@ export class StartComponent implements OnInit, OnDestroy {
resetScroll(): void { resetScroll(): void {
this.scrollToBlock(this.chainTip); this.scrollToBlock(this.chainTip);
this.blockchainContainer.nativeElement.scrollLeft = 0;
} }
getPageIndexOf(height: number): number { getPageIndexOf(height: number): number {

2
frontend/src/app/components/transaction/transaction.component.ts
View File

@ -22,7 +22,7 @@ import { SeoService } from '../../services/seo.service';
import { BlockExtended, CpfpInfo } from '../../interfaces/node-api.interface'; import { BlockExtended, CpfpInfo } from '../../interfaces/node-api.interface';
import { LiquidUnblinding } from './liquid-ublinding'; import { LiquidUnblinding } from './liquid-ublinding';
import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe'; import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe';
import { Price, PriceService } from 'src/app/services/price.service'; import { Price, PriceService } from '../../services/price.service';
@Component({ @Component({
selector: 'app-transaction', selector: 'app-transaction',

2
frontend/src/app/components/transactions-list/transactions-list.component.ts
View File

@ -9,7 +9,7 @@ import { AssetsService } from '../../services/assets.service';
import { filter, map, tap, switchMap, shareReplay } from 'rxjs/operators'; import { filter, map, tap, switchMap, shareReplay } from 'rxjs/operators';
import { BlockExtended } from '../../interfaces/node-api.interface'; import { BlockExtended } from '../../interfaces/node-api.interface';
import { ApiService } from '../../services/api.service'; import { ApiService } from '../../services/api.service';
import { PriceService } from 'src/app/services/price.service'; import { PriceService } from '../../services/price.service';
@Component({ @Component({
selector: 'app-transactions-list', selector: 'app-transactions-list',

2
frontend/src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.ts
View File

@ -1,6 +1,6 @@
import { Component, ElementRef, ViewChild, Input, OnChanges, OnInit } from '@angular/core'; import { Component, ElementRef, ViewChild, Input, OnChanges, OnInit } from '@angular/core';
import { tap } from 'rxjs'; import { tap } from 'rxjs';
import { Price, PriceService } from 'src/app/services/price.service'; import { Price, PriceService } from '../../services/price.service';
interface Xput { interface Xput {
type: 'input' | 'output' | 'fee'; type: 'input' | 'output' | 'fee';

10
frontend/src/app/components/tx-bowtie-graph/tx-bowtie-graph.component.ts
View File

@ -199,8 +199,8 @@ export class TxBowtieGraphComponent implements OnInit, OnChanges {
this.outputs = this.initLines('out', voutWithFee, totalValue, this.maxStrands); this.outputs = this.initLines('out', voutWithFee, totalValue, this.maxStrands);
this.middle = { this.middle = {
path: `M ${(this.width / 2) - this.midWidth} ${(this.height / 2) + 0.25} L ${(this.width / 2) + this.midWidth} ${(this.height / 2) + 0.25}`, path: `M ${(this.width / 2) - this.midWidth} ${(this.height / 2) + 0.5} L ${(this.width / 2) + this.midWidth} ${(this.height / 2) + 0.5}`,
style: `stroke-width: ${this.combinedWeight + 0.5}; stroke: ${this.gradient[1]}` style: `stroke-width: ${this.combinedWeight + 1}; stroke: ${this.gradient[1]}`
}; };
this.hasLine = this.inputs.reduce((line, put) => line || !put.zeroValue, false) this.hasLine = this.inputs.reduce((line, put) => line || !put.zeroValue, false)
@ -257,7 +257,7 @@ export class TxBowtieGraphComponent implements OnInit, OnChanges {
const lineParams = weights.map((w, i) => { const lineParams = weights.map((w, i) => {
return { return {
weight: w, weight: w,
thickness: xputs[i].value === 0 ? this.zeroValueThickness : Math.min(this.combinedWeight + 0.5, Math.max(this.minWeight - 1, w) + 1), thickness: xputs[i].value === 0 ? this.zeroValueThickness : Math.max(this.minWeight - 1, w) + 1,
offset: 0, offset: 0,
innerY: 0, innerY: 0,
outerY: 0, outerY: 0,
@ -269,7 +269,7 @@ export class TxBowtieGraphComponent implements OnInit, OnChanges {
// bounds of the middle segment // bounds of the middle segment
const innerTop = (this.height / 2) - (this.combinedWeight / 2); const innerTop = (this.height / 2) - (this.combinedWeight / 2);
const innerBottom = innerTop + this.combinedWeight + 0.5; const innerBottom = innerTop + this.combinedWeight;
// tracks the visual bottom of the endpoints of the previous line // tracks the visual bottom of the endpoints of the previous line
let lastOuter = 0; let lastOuter = 0;
let lastInner = innerTop; let lastInner = innerTop;
@ -294,7 +294,7 @@ export class TxBowtieGraphComponent implements OnInit, OnChanges {
// set the vertical position of the (center of the) outer side of the line // set the vertical position of the (center of the) outer side of the line
line.outerY = lastOuter + (line.thickness / 2); line.outerY = lastOuter + (line.thickness / 2);
line.innerY = Math.min(innerBottom - (line.thickness / 2), Math.max(innerTop + (line.thickness / 2), lastInner + (line.weight / 2))); line.innerY = Math.min(innerBottom + (line.thickness / 2), Math.max(innerTop + (line.thickness / 2), lastInner + (line.weight / 2)));
// special case to center single input/outputs // special case to center single input/outputs
if (xputs.length === 1) { if (xputs.length === 1) {

213
frontend/src/app/docs/api-docs/api-docs-data.ts
View File

@ -2907,6 +2907,219 @@ export const restApiDocsData = [
} }
}, },
... ...
]`
},
codeSampleLiquid: emptyCodeSample,
codeSampleLiquidTestnet: emptyCodeSample,
codeSampleBisq: emptyCodeSample,
}
}
},
{
type: "endpoint",
category: "blocks",
httpRequestMethod: "GET",
fragment: "get-blocks-bulk",
title: "GET Blocks (Bulk)",
description: {
default: "<p>Returns details on the range of blocks between <code>:minHeight</code> and <code>:maxHeight</code>, inclusive, up to 10 blocks. If <code>:maxHeight</code> is not specified, it defaults to the current tip.</p><p>To return data for more than 10 blocks, consider becoming an <a href='/enterprise'>enterprise sponsor</a>.</p>"
},
urlString: "/v1/blocks-bulk/:minHeight[/:maxHeight]",
showConditions: bitcoinNetworks,
showJsExamples: showJsExamplesDefaultFalse,
codeExample: {
default: {
codeTemplate: {
curl: `/api/v1/blocks-bulk/%{1}/%{2}`,
commonJS: ``,
},
codeSampleMainnet: {
esModule: [],
commonJS: [],
curl: [100000,100000],
response: `[
{
"height": 100000,
"hash": "000000000003ba27aa200b1cecaad478d2b00432346c3f1f3986da1afd33e506",
"timestamp": 1293623863,
"median_timestamp": 1293622620,
"previous_block_hash": "000000000002d01c1fccc21636b607dfd930d31d01c3a62104612a1719011250",
"difficulty": 14484.1623612254,
"header": "0100000050120119172a610421a6c3011dd330d9df07b63616c2cc1f1cd00200000000006657a9252aacd5c0b2940996ecff952228c3067cc38d4885efb5a4ac4247e9f337221b4d4c86041b0f2b5710",
"version": 1,
"bits": 453281356,
"nonce": 274148111,
"size": 957,
"weight": 3828,
"tx_count": 4,
"merkle_root": "f3e94742aca4b5ef85488dc37c06c3282295ffec960994b2c0d5ac2a25a95766",
"reward": 5000000000,
"total_fee_amt": 0,
"avg_fee_amt": 0,
"median_fee_amt": 0,
"fee_amt_percentiles": {
"min": 0,
"perc_10": 0,
"perc_25": 0,
"perc_50": 0,
"perc_75": 0,
"perc_90": 0,
"max": 0
},
"avg_fee_rate": 0,
"median_fee_rate": 0,
"fee_rate_percentiles": {
"min": 0,
"perc_10": 0,
"perc_25": 0,
"perc_50": 0,
"perc_75": 0,
"perc_90": 0,
"max": 0
},
"total_inputs": 3,
"total_input_amt": 5301000000,
"total_outputs": 6,
"total_output_amt": 5301000000,
"segwit_total_txs": 0,
"segwit_total_size": 0,
"segwit_total_weight": 0,
"avg_tx_size": 185.25,
"utxoset_change": 3,
"utxoset_size": 71888,
"coinbase_raw": "044c86041b020602",
"coinbase_address": null,
"coinbase_signature": "OP_PUSHBYTES_65 041b0e8c2567c12536aa13357b79a073dc4444acb83c4ec7a0e2f99dd7457516c5817242da796924ca4e99947d087fedf9ce467cb9f7c6287078f801df276fdf84 OP_CHECKSIG",
"coinbase_signature_ascii": "\u0004L<34>\u0004\u001b\u0002\u0006\u0002",
"pool_slug": "unknown",
"orphans": []
}
]`,
},
codeSampleTestnet: {
esModule: [],
commonJS: [],
curl: [100000,100000],
response: `[
{
"height": 100000,
"hash": "00000000009e2958c15ff9290d571bf9459e93b19765c6801ddeccadbb160a1e",
"timestamp": 1376123972,
"median_timestamp": 1677396660,
"previous_block_hash": "000000004956cc2edd1a8caa05eacfa3c69f4c490bfc9ace820257834115ab35",
"difficulty": 271.7576739288896,
"header": "0200000035ab154183570282ce9afc0b494c9fc6a3cfea05aa8c1add2ecc56490000000038ba3d78e4500a5a7570dbe61960398add4410d278b21cd9708e6d9743f374d544fc055227f1001c29c1ea3b",
"version": 2,
"bits": 469823783,
"nonce": 1005240617,
"size": 221,
"weight": 884,
"tx_count": 1,
"merkle_root": "d574f343976d8e70d91cb278d21044dd8a396019e6db70755a0a50e4783dba38",
"reward": 5000000000,
"total_fee_amt": 0,
"avg_fee_amt": 0,
"median_fee_amt": 0,
"fee_amt_percentiles": {
"min": 0,
"perc_10": 0,
"perc_25": 0,
"perc_50": 0,
"perc_75": 0,
"perc_90": 0,
"max": 0
},
"avg_fee_rate": 0,
"median_fee_rate": 0,
"fee_rate_percentiles": {
"min": 0,
"perc_10": 0,
"perc_25": 0,
"perc_50": 0,
"perc_75": 0,
"perc_90": 0,
"max": 0
},
"total_inputs": 0,
"total_input_amt": null,
"total_outputs": 1,
"total_output_amt": 0,
"segwit_total_txs": 0,
"segwit_total_size": 0,
"segwit_total_weight": 0,
"avg_tx_size": 0,
"utxoset_change": 1,
"utxoset_size": null,
"coinbase_raw": "03a08601000427f1001c046a510100522cfabe6d6d0000000000000000000068692066726f6d20706f6f6c7365727665726aac1eeeed88",
"coinbase_address": "mtkbaiLiUH3fvGJeSzuN3kUgmJzqinLejJ",
"coinbase_signature": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 912e2b234f941f30b18afbb4fa46171214bf66c8 OP_EQUALVERIFY OP_CHECKSIG",
"coinbase_signature_ascii": "\u0003 <20>\u0001\u0000\u0004'ñ\u0000\u001c\u0004jQ\u0001\u0000R,ú¾mm\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000hi from poolserverj¬\u001eîí<C3AE>",
"pool_slug": "unknown",
"orphans": []
}
]`
},
codeSampleSignet: {
esModule: [],
commonJS: [],
curl: [100000,100000],
response: `[
{
"height": 100000,
"hash": "0000008753108390007b3f5c26e5d924191567e147876b84489b0c0cf133a0bf",
"timestamp": 1658421183,
"median_timestamp": 1658418056,
"previous_block_hash": "000000b962a13c3dd3f81917bc8646a0c98224adcd5124026d4fdfcb76a76d30",
"difficulty": 0.002781447610743506,
"header": "00000020306da776cbdf4f6d022451cdad2482c9a04686bc1719f8d33d3ca162b90000001367fb15320ebb1932fd589f8f38866b692ca8a4ad6100a4bc732d212916d0efbf7fd9628567011e47662d00",
"version": 536870912,
"bits": 503408517,
"nonce": 2975303,
"size": 343,
"weight": 1264,
"tx_count": 1,
"merkle_root": "efd01629212d73bca40061ada4a82c696b86388f9f58fd3219bb0e3215fb6713",
"reward": 5000000000,
"total_fee_amt": 0,
"avg_fee_amt": 0,
"median_fee_amt": 0,
"fee_amt_percentiles": {
"min": 0,
"perc_10": 0,
"perc_25": 0,
"perc_50": 0,
"perc_75": 0,
"perc_90": 0,
"max": 0
},
"avg_fee_rate": 0,
"median_fee_rate": 0,
"fee_rate_percentiles": {
"min": 0,
"perc_10": 0,
"perc_25": 0,
"perc_50": 0,
"perc_75": 0,
"perc_90": 0,
"max": 0
},
"total_inputs": 0,
"total_input_amt": null,
"total_outputs": 2,
"total_output_amt": 0,
"segwit_total_txs": 0,
"segwit_total_size": 0,
"segwit_total_weight": 0,
"avg_tx_size": 0,
"utxoset_change": 2,
"utxoset_size": null,
"coinbase_raw": "03a08601",
"coinbase_address": "tb1psfjl80vk0yp3agcq6ylueas29rau00mfq90mhejerpgccg33xhasd9gjyd",
"coinbase_signature": "OP_PUSHNUM_1 OP_PUSHBYTES_32 8265f3bd9679031ea300d13fccf60a28fbc7bf69015fbbe65918518c223135fb",
"coinbase_signature_ascii": "\u0003 <20>\u0001",
"pool_slug": "unknown",
"orphans": []
}
]` ]`
}, },
codeSampleLiquid: emptyCodeSample, codeSampleLiquid: emptyCodeSample,

2
frontend/src/app/docs/api-docs/api-docs.component.html
View File

@ -39,7 +39,7 @@
<div class="doc-content"> <div class="doc-content">
<p class="doc-welcome-note">Below is a reference for the {{ network.val === '' ? 'Bitcoin' : network.val.charAt(0).toUpperCase() + network.val.slice(1) }} <ng-container i18n="api-docs.title">REST API service</ng-container>.</p> <p class="doc-welcome-note">Below is a reference for the {{ network.val === '' ? 'Bitcoin' : network.val.charAt(0).toUpperCase() + network.val.slice(1) }} <ng-container i18n="api-docs.title">REST API service</ng-container>.</p>
<p class="doc-welcome-note api-note" *ngIf="officialMempoolInstance">Note that we enforce rate limits. If you exceed these limits, you will get a polite error encouraging you to run your own Mempool instance. If you repeatedly exceed the limits, you may be banned from accessing the service altogether.</p> <p class="doc-welcome-note api-note" *ngIf="officialMempoolInstance">Note that we enforce rate limits. If you exceed these limits, you will get an HTTP 429 error. If you repeatedly exceed the limits, you may be banned from accessing the service altogether. Consider an <a [routerLink]="['/enterprise']">enterprise sponsorship</a> if you need higher API limits.</p>
<div class="doc-item-container" *ngFor="let item of restDocs"> <div class="doc-item-container" *ngFor="let item of restDocs">
<h3 *ngIf="( item.type === 'category' ) && ( item.showConditions.indexOf(network.val) > -1 )">{{ item.title }}</h3> <h3 *ngIf="( item.type === 'category' ) && ( item.showConditions.indexOf(network.val) > -1 )">{{ item.title }}</h3>

2
frontend/src/app/docs/docs/docs.component.html
View File

@ -32,7 +32,7 @@
</ng-template> </ng-template>
</li> </li>
<li [ngbNavItem]="3" *ngIf="showElectrsTab" role="presentation"> <li [ngbNavItem]="3" *ngIf="showElectrsTab" role="presentation" class="hide-on-mobile">
<a ngbNavLink [routerLink]="['/docs/api/electrs' | relativeUrl]" role="tab">API - Electrum RPC</a> <a ngbNavLink [routerLink]="['/docs/api/electrs' | relativeUrl]" role="tab">API - Electrum RPC</a>
<ng-template ngbNavContent> <ng-template ngbNavContent>

6
frontend/src/app/docs/docs/docs.component.scss
View File

@ -7,3 +7,9 @@
#footer { #footer {
clear: both; clear: both;
} }
@media (max-width: 992px) {
.hide-on-mobile {
display: none;
}
}

1
frontend/src/app/interfaces/node-api.interface.ts
View File

@ -114,7 +114,6 @@ export interface BlockExtension {
medianFee?: number; medianFee?: number;
feeRange?: number[]; feeRange?: number[];
reward?: number; reward?: number;
coinbaseTx?: Transaction;
coinbaseRaw?: string; coinbaseRaw?: string;
matchRate?: number; matchRate?: number;
pool?: { pool?: {

47
frontend/src/app/lightning/channel/channel.component.html
View File

@ -1,25 +1,32 @@
<div class="container-xl" *ngIf="(channel$ | async) as channel; else skeletonLoader"> <div class="container-xl" *ngIf="(channel$ | async) as channel; else skeletonLoader">
<h5 class="mb-0" style="color: #ffffff66" i18n="lightning.channel">Lightning channel</h5>
<div class="title-container"> <ng-container *ngIf="!error">
<h1 class="mb-0">{{ channel.short_id }}</h1> <h5 class="mb-0" style="color: #ffffff66" i18n="lightning.channel">Lightning channel</h5>
<span class="tx-link"> <div class="title-container">
<a [routerLink]="['/lightning/channel' | relativeUrl, channel.id]">{{ channel.id }}</a> <h1 class="mb-0">{{ channel.short_id }}</h1>
<app-clipboard [text]="channel.id"></app-clipboard> <span class="tx-link">
</span> <a [routerLink]="['/lightning/channel' | relativeUrl, channel.id]">{{ channel.id }}</a>
</div> <app-clipboard [text]="channel.id"></app-clipboard>
<div class="badges mb-2"> </span>
<span class="badge rounded-pill badge-secondary" *ngIf="channel.status === 0" i18n="status.inactive">Inactive</span> </div>
<span class="badge rounded-pill badge-success" *ngIf="channel.status === 1" i18n="status.active">Active</span> <div class="badges mb-2">
<span class="badge rounded-pill badge-danger" *ngIf="channel.status === 2" i18n="status.closed">Closed</span> <span class="badge rounded-pill badge-secondary" *ngIf="channel.status === 0" i18n="status.inactive">Inactive</span>
<app-closing-type *ngIf="channel.closing_reason" [type]="channel.closing_reason"></app-closing-type> <span class="badge rounded-pill badge-success" *ngIf="channel.status === 1" i18n="status.active">Active</span>
</div> <span class="badge rounded-pill badge-danger" *ngIf="channel.status === 2" i18n="status.closed">Closed</span>
<app-closing-type *ngIf="channel.closing_reason" [type]="channel.closing_reason"></app-closing-type>
</div>
</ng-container>
<div class="clearfix"></div> <div class="clearfix"></div>
<div *ngIf="error" class="d-flex flex-column justify-content-around align-items-center mt-5 w-100" style="min-height: 100px">
<span class="text-center" i18n="lightning.channel-not-found">No channel found for short id "{{ channel.short_id }}"</span>
</div>
<app-nodes-channels-map *ngIf="!error && (channelGeo$ | async) as channelGeo" [style]="'channelpage'" <app-nodes-channels-map *ngIf="!error && (channelGeo$ | async) as channelGeo" [style]="'channelpage'"
[channel]="channelGeo"></app-nodes-channels-map> [channel]="channelGeo"></app-nodes-channels-map>
<div class="box"> <div class="box" *ngIf="!error">
<div class="row"> <div class="row">
<div class="col-md"> <div class="col-md">
@ -65,7 +72,7 @@
<br> <br>
<div class="row row-cols-1 row-cols-md-2"> <div class="row row-cols-1 row-cols-md-2" *ngIf="!error">
<div class="col"> <div class="col">
<app-channel-box [channel]="channel.node_left"></app-channel-box> <app-channel-box [channel]="channel.node_left"></app-channel-box>
<app-channel-close-box *ngIf="showCloseBoxes(channel)" [channel]="channel" [local]="channel.node_left" [remote]="channel.node_right"></app-channel-close-box> <app-channel-close-box *ngIf="showCloseBoxes(channel)" [channel]="channel" [local]="channel.node_left" [remote]="channel.node_right"></app-channel-close-box>
@ -104,14 +111,6 @@
<br> <br>
<ng-template [ngIf]="error">
<div class="text-center">
<span i18n="error.general-loading-data">Error loading data.</span>
<br><br>
<i>{{ error.status }}: {{ error.error }}</i>
</div>
</ng-template>
<ng-template #skeletonLoader> <ng-template #skeletonLoader>
<div class="container-xl"> <div class="container-xl">
<h5 class="mb-0" style="color: #ffffff66" i18n="lightning.channel">Lightning channel</h5> <h5 class="mb-0" style="color: #ffffff66" i18n="lightning.channel">Lightning channel</h5>

4
frontend/src/app/lightning/channel/channel.component.ts
View File

@ -38,7 +38,9 @@ export class ChannelComponent implements OnInit {
}), }),
catchError((err) => { catchError((err) => {
this.error = err; this.error = err;
return of(null); return [{
short_id: params.get('short_id')
}];
}) })
); );
}), }),

4
frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html
View File

@ -55,7 +55,7 @@
</div> </div>
<!-- Top nodes per capacity --> <!-- Top nodes per capacity -->
<div class="col"> <div class="col" style="max-height: 410px">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<a class="title-link" href="" [routerLink]="['/lightning/nodes/rankings/liquidity' | relativeUrl]"> <a class="title-link" href="" [routerLink]="['/lightning/nodes/rankings/liquidity' | relativeUrl]">
@ -69,7 +69,7 @@
</div> </div>
<!-- Top nodes per channels --> <!-- Top nodes per channels -->
<div class="col"> <div class="col" style="max-height: 410px">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<a class="title-link" href="" [routerLink]="['/lightning/nodes/rankings/connectivity' | relativeUrl]"> <a class="title-link" href="" [routerLink]="['/lightning/nodes/rankings/connectivity' | relativeUrl]">

25
frontend/src/app/lightning/node/node.component.html
View File

@ -1,20 +1,23 @@
<div class="container-xl" *ngIf="(node$ | async) as node; else skeletonLoader"> <div class="container-xl" *ngIf="(node$ | async) as node; else skeletonLoader">
<h5 class="mb-0" style="color: #ffffff66" i18n="lightning.node">Lightning node</h5>
<div class="title-container mb-2" *ngIf="!error"> <ng-container *ngIf="!error">
<h1 class="mb-0 text-truncate">{{ node.alias }}</h1> <h5 class="mb-0" style="color: #ffffff66" i18n="lightning.node">Lightning node</h5>
<span class="tx-link"> <div class="title-container mb-2">
<span class="node-id"> <h1 class="mb-0 text-truncate">{{ node.alias }}</h1>
<app-truncate [text]="node.public_key" [lastChars]="8" [link]="['/lightning/node' | relativeUrl, node.public_key]"> <span class="tx-link">
<app-clipboard [text]="node.public_key"></app-clipboard> <span class="node-id">
</app-truncate> <app-truncate [text]="node.public_key" [lastChars]="8" [link]="['/lightning/node' | relativeUrl, node.public_key]">
<app-clipboard [text]="node.public_key"></app-clipboard>
</app-truncate>
</span>
</span> </span>
</span> </div>
</div> </ng-container>
<div class="clearfix"></div> <div class="clearfix"></div>
<div *ngIf="error" class="d-flex flex-column justify-content-around align-items-center mt-5 w-100" style="min-height: 100px"> <div *ngIf="error" class="d-flex flex-column justify-content-around align-items-center mt-5 w-100" style="min-height: 100px">
<span i18n="lightning.node-not-found">No node found for public key "{{ node.public_key | shortenString : 12}}"</span> <span class="text-center" i18n="lightning.node-not-found">No node found for public key "{{ node.public_key | shortenString : 12}}"</span>
</div> </div>
<div class="box" *ngIf="!error"> <div class="box" *ngIf="!error">

58
frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts
View File

@ -161,28 +161,7 @@ export class NodesNetworksChartComponent implements OnInit {
{ {
zlevel: 1, zlevel: 1,
yAxisIndex: 0, yAxisIndex: 0,
name: $localize`Reachable on Clearnet Only`, name: $localize`Clearnet and Darknet`,
showSymbol: false,
symbol: 'none',
data: data.clearnet_nodes,
type: 'line',
lineStyle: {
width: 2,
},
areaStyle: {
opacity: 0.5,
},
stack: 'Total',
color: new graphic.LinearGradient(0, 0.75, 0, 1, [
{ offset: 0, color: '#FFB300' },
{ offset: 1, color: '#FFB300AA' },
]),
smooth: false,
},
{
zlevel: 1,
yAxisIndex: 0,
name: $localize`Reachable on Clearnet and Darknet`,
showSymbol: false, showSymbol: false,
symbol: 'none', symbol: 'none',
data: data.clearnet_tor_nodes, data: data.clearnet_tor_nodes,
@ -203,7 +182,28 @@ export class NodesNetworksChartComponent implements OnInit {
{ {
zlevel: 1, zlevel: 1,
yAxisIndex: 0, yAxisIndex: 0,
name: $localize`Reachable on Darknet Only`, name: $localize`Clearnet (IPv4, IPv6)`,
showSymbol: false,
symbol: 'none',
data: data.clearnet_nodes,
type: 'line',
lineStyle: {
width: 2,
},
areaStyle: {
opacity: 0.5,
},
stack: 'Total',
color: new graphic.LinearGradient(0, 0.75, 0, 1, [
{ offset: 0, color: '#FFB300' },
{ offset: 1, color: '#FFB300AA' },
]),
smooth: false,
},
{
zlevel: 1,
yAxisIndex: 0,
name: $localize`Darknet Only (Tor, I2P, cjdns)`,
showSymbol: false, showSymbol: false,
symbol: 'none', symbol: 'none',
data: data.tor_nodes, data: data.tor_nodes,
@ -284,7 +284,7 @@ export class NodesNetworksChartComponent implements OnInit {
padding: 10, padding: 10,
data: [ data: [
{ {
name: $localize`Reachable on Darknet Only`, name: $localize`Darknet Only (Tor, I2P, cjdns)`,
inactiveColor: 'rgb(110, 112, 121)', inactiveColor: 'rgb(110, 112, 121)',
textStyle: { textStyle: {
color: 'white', color: 'white',
@ -292,7 +292,7 @@ export class NodesNetworksChartComponent implements OnInit {
icon: 'roundRect', icon: 'roundRect',
}, },
{ {
name: $localize`Reachable on Clearnet and Darknet`, name: $localize`Clearnet (IPv4, IPv6)`,
inactiveColor: 'rgb(110, 112, 121)', inactiveColor: 'rgb(110, 112, 121)',
textStyle: { textStyle: {
color: 'white', color: 'white',
@ -300,7 +300,7 @@ export class NodesNetworksChartComponent implements OnInit {
icon: 'roundRect', icon: 'roundRect',
}, },
{ {
name: $localize`Reachable on Clearnet Only`, name: $localize`Clearnet and Darknet`,
inactiveColor: 'rgb(110, 112, 121)', inactiveColor: 'rgb(110, 112, 121)',
textStyle: { textStyle: {
color: 'white', color: 'white',
@ -317,9 +317,9 @@ export class NodesNetworksChartComponent implements OnInit {
}, },
], ],
selected: this.widget ? undefined : JSON.parse(this.storageService.getValue('nodes_networks_legend')) ?? { selected: this.widget ? undefined : JSON.parse(this.storageService.getValue('nodes_networks_legend')) ?? {
'$localize`Reachable on Darknet Only`': true, '$localize`Darknet Only (Tor, I2P, cjdns)`': true,
'$localize`Reachable on Clearnet Only`': true, '$localize`Clearnet (IPv4, IPv6)`': true,
'$localize`Reachable on Clearnet and Darknet`': true, '$localize`Clearnet and Darknet`': true,
'$localize`:@@e5d8bb389c702588877f039d72178f219453a72d:Unknown`': true, '$localize`:@@e5d8bb389c702588877f039d72178f219453a72d:Unknown`': true,
} }
}, },

91
frontend/src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html
View File

@ -1,71 +1,56 @@
<div [class]="!widget ? 'container-xl full-height' : ''">
<h1 *ngIf="!widget" class="float-left">
<span i18n="lightning.top-100-liquidity">Top 100 nodes liquidity ranking</span>
</h1>
<div [class]="widget ? 'widget' : 'full'">
<table class="table table-borderless table-fixed"> <div class="container-xl" style="min-height: 335px" [ngClass]="{'widget': widget, 'full-height': !widget}">
<h1 *ngIf="!widget" class="float-left" i18n="lightning.liquidity-ranking">Liquidity Ranking</h1>
<div class="clearfix"></div>
<div style="min-height: 295px">
<table class="table table-borderless">
<thead> <thead>
<th class="rank"></th> <th class="text-left" i18n="nodes.alias">Alias</th>
<th class="alias text-left" i18n="nodes.alias">Alias</th> <th class="liquidity text-right" i18n="node.liquidity">Liquidity</th>
<th class="capacity text-right" i18n="node.liquidity">Liquidity</th> <th class="d-table-cell fiat text-right" [class]="{'widget': widget}">{{ currency$ | async }}</th>
<th *ngIf="!widget" class="channels text-right" i18n="lightning.channels">Channels</th> <th *ngIf="!widget" class="d-none d-md-table-cell channels text-right" i18n="lightning.channels">Channels</th>
<th *ngIf="!widget" class="timestamp-first text-left" i18n="transaction.first-seen|Transaction first seen">First seen</th> <th *ngIf="!widget" class="d-none d-md-table-cell timestamp text-right" i18n="transaction.first-seen|Transaction first seen">First seen</th>
<th *ngIf="!widget" class="timestamp-update text-left" i18n="lightning.last_update">Last update</th> <th *ngIf="!widget" class="d-none d-md-table-cell timestamp text-right" i18n="lightning.last_update">Last update</th>
<th *ngIf="!widget" class="location text-right" i18n="lightning.location">Location</th> <th *ngIf="!widget" class="d-none d-md-table-cell text-right" i18n="lightning.location">Location</th>
</thead> </thead>
<tbody *ngIf="topNodesPerCapacity$ | async as nodes; else skeleton"> <tbody *ngIf="topNodesPerCapacity$ | async as nodes">
<tr *ngFor="let node of nodes; let i = index;"> <tr *ngFor="let node of nodes;">
<td class="rank text-left"> <td class="pool text-left">
{{ i + 1 }} <div class="tooltip-custom d-block w-100">
<a class="link d-block w-100" [routerLink]="['/lightning/node' | relativeUrl, node.publicKey]">
<span class="pool-name w-100">{{ node.alias }}</span>
</a>
</div>
</td> </td>
<td class="alias text-left"> <td class="text-right">
<a [routerLink]="['/lightning/node' | relativeUrl, node.publicKey]">{{ node.alias }}</a>
</td>
<td class="capacity text-right">
<app-amount [satoshis]="node.capacity" [digitsInfo]="'1.2-2'" [noFiat]="true"></app-amount> <app-amount [satoshis]="node.capacity" [digitsInfo]="'1.2-2'" [noFiat]="true"></app-amount>
</td> </td>
<td *ngIf="!widget" class="channels text-right"> <td class="d-table-cell fiat text-right" [ngClass]="{'widget': widget}">
<app-fiat [value]="node.capacity"></app-fiat>
</td>
<td *ngIf="!widget" class="d-none d-md-table-cell text-right">
{{ node.channels | number }} {{ node.channels | number }}
</td> </td>
<td *ngIf="!widget" class="timestamp-first text-left"> <td *ngIf="!widget" class="d-none d-md-table-cell text-right">
<app-timestamp [customFormat]="'yyyy-MM-dd'" [unixTime]="node.firstSeen" [hideTimeSince]="true"></app-timestamp> <app-timestamp [customFormat]="'yyyy-MM-dd'" [unixTime]="node.firstSeen" [hideTimeSince]="true"></app-timestamp>
</td> </td>
<td *ngIf="!widget" class="timestamp-update text-left"> <td *ngIf="!widget" class="d-none d-md-table-cell text-right">
<app-timestamp [customFormat]="'yyyy-MM-dd'" [unixTime]="node.updatedAt" [hideTimeSince]="true"></app-timestamp> <app-timestamp [customFormat]="'yyyy-MM-dd'" [unixTime]="node.updatedAt" [hideTimeSince]="true"></app-timestamp>
</td> </td>
<td *ngIf="!widget" class="location text-right text-truncate"> <td *ngIf="!widget" class="d-none d-md-table-cell text-right text-truncate">
<app-geolocation [data]="node.geolocation" [type]="'list-isp'"></app-geolocation> <app-geolocation [data]="node.geolocation" [type]="'list-isp'"></app-geolocation>
</td> </td>
</tr> </tr>
</tbody> </tbody>
<ng-template #skeleton>
<tbody>
<tr *ngFor="let item of skeletonRows">
<td class="rank text-left">
<span class="skeleton-loader"></span>
</td>
<td class="alias text-left">
<span class="skeleton-loader"></span>
</td>
<td class="capacity text-right">
<span class="skeleton-loader"></span>
</td>
<td *ngIf="!widget" class="channels text-right">
<span class="skeleton-loader"></span>
</td>
<td *ngIf="!widget" class="timestamp-first text-left">
<span class="skeleton-loader"></span>
</td>
<td *ngIf="!widget" class="timestamp-update text-left">
<span class="skeleton-loader"></span>
</td>
<td *ngIf="!widget" class="location text-right text-truncate">
<span class="skeleton-loader"></span>
</td>
</tr>
</tbody>
</ng-template>
</table> </table>
<ng-template [ngIf]="!widget">
<div class="clearfix"></div>
<br>
</ng-template>
</div> </div>
</div>
</div>

101
frontend/src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.scss
View File

@ -1,91 +1,52 @@
.container-xl { .container-xl {
max-width: 1400px; max-width: 1400px;
padding-bottom: 100px; }
@media (min-width: 960px) { .container-xl.widget {
padding-left: 50px; padding-right: 0px;
padding-right: 50px; padding-left: 0px;
} padding-bottom: 0px;
} }
.table td, .table th { tr, td, th {
padding: 0.5rem; border: 0px;
padding-top: 0.65rem !important;
padding-bottom: 0.7rem !important;
} }
.full .rank { .clear-link {
width: 5%; color: white;
}
.widget .rank {
@media (min-width: 960px) {
width: 13%;
}
@media (max-width: 960px) {
padding-left: 0px;
padding-right: 0px;
}
} }
.full .alias { .pool {
width: 20%; width: 15%;
@media (max-width: 575px) {
width: 75%;
}
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 350px; white-space: nowrap;
@media (max-width: 960px) { max-width: 160px;
width: 40%;
max-width: 500px;
}
} }
.widget .alias { .pool-name {
width: 60%; display: inline-block;
overflow: hidden; vertical-align: text-top;
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 350px; overflow: hidden;
@media (max-width: 960px) {
max-width: 175px;
}
} }
.full .capacity { .liquidity {
width: 10%; width: 10%;
@media (max-width: 960px) { @media (max-width: 575px) {
width: 30%; width: 25%;
}
}
.widget .capacity {
width: 32%;
@media (max-width: 960px) {
padding-left: 0px;
padding-right: 0px;
} }
} }
.full .channels { .fiat {
width: 15%; width: 15%;
padding-right: 50px; @media (min-width: 768px) and (max-width: 991px) {
@media (max-width: 960px) { display: none !important;
display: none; }
@media (max-width: 575px) {
display: none !important;
} }
} }
.full .timestamp-first {
width: 10%;
@media (max-width: 960px) {
display: none;
}
}
.full .timestamp-update {
width: 10%;
@media (max-width: 960px) {
display: none;
}
}
.full .location {
width: 15%;
@media (max-width: 960px) {
width: 30%;
}
@media (max-width: 600px) {
display: none;
}
}

12
frontend/src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.ts
View File

@ -1,8 +1,8 @@
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
import { map, Observable } from 'rxjs'; import { map, Observable } from 'rxjs';
import { StateService } from 'src/app/services/state.service';
import { INodesRanking, ITopNodesPerCapacity } from '../../../interfaces/node-api.interface'; import { INodesRanking, ITopNodesPerCapacity } from '../../../interfaces/node-api.interface';
import { SeoService } from '../../../services/seo.service'; import { SeoService } from '../../../services/seo.service';
import { isMobile } from '../../../shared/common.utils';
import { GeolocationData } from '../../../shared/components/geolocation/geolocation.component'; import { GeolocationData } from '../../../shared/components/geolocation/geolocation.component';
import { LightningApiService } from '../../lightning-api.service'; import { LightningApiService } from '../../lightning-api.service';
@ -18,18 +18,22 @@ export class TopNodesPerCapacity implements OnInit {
topNodesPerCapacity$: Observable<ITopNodesPerCapacity[]>; topNodesPerCapacity$: Observable<ITopNodesPerCapacity[]>;
skeletonRows: number[] = []; skeletonRows: number[] = [];
currency$: Observable<string>;
constructor( constructor(
private apiService: LightningApiService, private apiService: LightningApiService,
private seoService: SeoService private seoService: SeoService,
private stateService: StateService,
) {} ) {}
ngOnInit(): void { ngOnInit(): void {
this.currency$ = this.stateService.fiatCurrency$;
if (!this.widget) { if (!this.widget) {
this.seoService.setTitle($localize`:@@2d9883d230a47fbbb2ec969e32a186597ea27405:Liquidity Ranking`); this.seoService.setTitle($localize`:@@2d9883d230a47fbbb2ec969e32a186597ea27405:Liquidity Ranking`);
} }
for (let i = 1; i <= (this.widget ? (isMobile() ? 8 : 7) : 100); ++i) { for (let i = 1; i <= (this.widget ? 6 : 100); ++i) {
this.skeletonRows.push(i); this.skeletonRows.push(i);
} }
@ -50,7 +54,7 @@ export class TopNodesPerCapacity implements OnInit {
} else { } else {
this.topNodesPerCapacity$ = this.nodes$.pipe( this.topNodesPerCapacity$ = this.nodes$.pipe(
map((ranking) => { map((ranking) => {
return ranking.topByCapacity.slice(0, isMobile() ? 8 : 7); return ranking.topByCapacity.slice(0, 6);
}) })
); );
} }

93
frontend/src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html
View File

@ -1,71 +1,56 @@
<div [class]="!widget ? 'container-xl full-height' : ''">
<h1 *ngIf="!widget" class="float-left">
<span i18n="lightning.top-100-connectivity">Top 100 nodes connectivity ranking</span>
</h1>
<div [class]="widget ? 'widget' : 'full'">
<div class="container-xl" style="min-height: 335px" [ngClass]="{'widget': widget, 'full-height': !widget}">
<h1 *ngIf="!widget" class="float-left" i18n="lightning.liquidity-ranking">Liquidity Ranking</h1>
<div class="clearfix"></div>
<div style="min-height: 295px">
<table class="table table-borderless"> <table class="table table-borderless">
<thead> <thead>
<th class="rank"></th> <th class="pool text-left" i18n="nodes.alias" [ngClass]="{'widget': widget}">Alias</th>
<th class="alias text-left" i18n="nodes.alias">Alias</th> <th class="liquidity text-right" i18n="node.channels">Channels</th>
<th class="channels text-right" i18n="node.channels">Channels</th> <th *ngIf="!widget" class="d-none d-md-table-cell channels text-right" i18n="lightning.channels">Capacity</th>
<th *ngIf="!widget" class="capacity text-right" i18n="lightning.liquidity">Liquidity</th> <th *ngIf="!widget" class="d-none d-md-table-cell text-right" i18n="node.liquidity">{{ currency$ | async }}</th>
<th *ngIf="!widget" class="timestamp-first text-left" i18n="transaction.first-seen|Transaction first seen">First seen</th> <th *ngIf="!widget" class="d-none d-md-table-cell timestamp text-right" i18n="transaction.first-seen|Transaction first seen">First seen</th>
<th *ngIf="!widget" class="timestamp-update text-left" i18n="lightning.last_update">Last update</th> <th *ngIf="!widget" class="d-none d-md-table-cell timestamp text-right" i18n="lightning.last_update">Last update</th>
<th *ngIf="!widget" class="location text-right" i18n="lightning.location">Location</th> <th class="geolocation d-table-cell text-right" i18n="lightning.location">Location</th>
</thead> </thead>
<tbody *ngIf="topNodesPerChannels$ | async as nodes; else skeleton"> <tbody *ngIf="topNodesPerChannels$ | async as nodes">
<tr *ngFor="let node of nodes; let i = index;"> <tr *ngFor="let node of nodes;">
<td class="rank text-left"> <td class="pool text-left">
{{ i + 1 }} <div class="tooltip-custom d-block w-100">
<a class="link d-block w-100" [routerLink]="['/lightning/node' | relativeUrl, node.publicKey]">
<span class="pool-name w-100">{{ node.alias }}</span>
</a>
</div>
</td> </td>
<td class="alias text-left"> <td class="text-right">
<a [routerLink]="['/lightning/node' | relativeUrl, node.publicKey]">{{ node.alias }}</a> {{ node.channels ? (node.channels | number) : '~' }}
</td> </td>
<td class="channels text-right"> <td *ngIf="!widget" class="d-none d-md-table-cell capacity text-right">
{{ node.channels | number }}
</td>
<td *ngIf="!widget" class="capacity text-right">
<app-amount [satoshis]="node.capacity" [digitsInfo]="'1.2-2'" [noFiat]="true"></app-amount> <app-amount [satoshis]="node.capacity" [digitsInfo]="'1.2-2'" [noFiat]="true"></app-amount>
</td> </td>
<td *ngIf="!widget" class="timestamp-first text-left"> <td *ngIf="!widget" class="fiat d-none d-md-table-cell text-right">
<app-fiat [value]="node.capacity"></app-fiat>
</td>
<td *ngIf="!widget" class="d-none d-md-table-cell text-right">
<app-timestamp [customFormat]="'yyyy-MM-dd'" [unixTime]="node.firstSeen" [hideTimeSince]="true"></app-timestamp> <app-timestamp [customFormat]="'yyyy-MM-dd'" [unixTime]="node.firstSeen" [hideTimeSince]="true"></app-timestamp>
</td> </td>
<td *ngIf="!widget" class="timestamp-update text-left"> <td *ngIf="!widget" class="d-none d-md-table-cell text-right">
<app-timestamp [customFormat]="'yyyy-MM-dd'" [unixTime]="node.updatedAt" [hideTimeSince]="true"></app-timestamp> <app-timestamp [customFormat]="'yyyy-MM-dd'" [unixTime]="node.updatedAt" [hideTimeSince]="true"></app-timestamp>
</td> </td>
<td *ngIf="!widget" class="location text-right text-truncate"> <td class="geolocation d-table-cell text-right text-truncate">
<app-geolocation [data]="node.geolocation" [type]="'list-isp'"></app-geolocation> <app-geolocation [data]="node.geolocation" [type]="'list-isp'"></app-geolocation>
</td> </td>
</tr> </tr>
</tbody> </tbody>
<ng-template #skeleton>
<tbody>
<tr *ngFor="let item of skeletonRows">
<td class="rank text-left">
<span class="skeleton-loader"></span>
</td>
<td class="alias text-left">
<span class="skeleton-loader"></span>
</td>
<td class="channels text-right">
<span class="skeleton-loader"></span>
</td>
<td *ngIf="!widget" class="capacity text-right">
<span class="skeleton-loader"></span>
</td>
<td *ngIf="!widget" class="timestamp-first text-left">
<span class="skeleton-loader"></span>
</td>
<td *ngIf="!widget" class="timestamp-update text-left">
<span class="skeleton-loader"></span>
</td>
<td *ngIf="!widget" class="location text-right text-truncate">
<span class="skeleton-loader"></span>
</td>
</tr>
</tbody>
</ng-template>
</table> </table>
<ng-template [ngIf]="!widget">
<div class="clearfix"></div>
<br>
</ng-template>
</div> </div>
</div>
</div>

103
frontend/src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.scss
View File

@ -1,91 +1,54 @@
.container-xl { .container-xl {
max-width: 1400px; max-width: 1400px;
padding-bottom: 100px; }
@media (min-width: 960px) { .container-xl.widget {
padding-left: 50px; padding-right: 0px;
padding-right: 50px; padding-left: 0px;
} padding-bottom: 0px;
} }
.table td, .table th { tr, td, th {
padding: 0.5rem; border: 0px;
padding-top: 0.65rem !important;
padding-bottom: 0.7rem !important;
} }
.full .rank { .clear-link {
width: 5%; color: white;
}
.widget .rank {
@media (min-width: 960px) {
width: 13%;
}
@media (max-width: 960px) {
padding-left: 0px;
padding-right: 0px;
}
} }
.full .alias { .pool {
width: 20%; width: 15%;
@media (max-width: 576px) {
width: 75%;
}
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 350px; white-space: nowrap;
@media (max-width: 960px) { max-width: 160px;
width: 40%;
max-width: 500px;
}
} }
.widget .alias { .pool-name {
width: 60%; display: inline-block;
overflow: hidden; vertical-align: text-top;
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 350px; overflow: hidden;
@media (max-width: 960px) { }
max-width: 175px; .pool.widget {
} width: 45%;
} }
.full .capacity { .liquidity {
width: 10%; width: 10%;
@media (max-width: 960px) { @media (max-width: 576px) {
width: 30%; width: 25%;
}
}
.widget .capacity {
width: 32%;
@media (max-width: 960px) {
padding-left: 0px;
padding-right: 0px;
} }
} }
.full .channels { .geolocation {
width: 15%; @media (min-width: 768px) and (max-width: 991px) {
padding-right: 50px; display: none !important;
@media (max-width: 960px) {
display: none;
} }
} @media (max-width: 575px) {
display: none !important;
.full .timestamp-first {
width: 10%;
@media (max-width: 960px) {
display: none;
}
}
.full .timestamp-update {
width: 10%;
@media (max-width: 960px) {
display: none;
}
}
.full .location {
width: 15%;
@media (max-width: 960px) {
width: 30%;
}
@media (max-width: 600px) {
display: none;
} }
} }

18
frontend/src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.ts
View File

@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
import { map, Observable } from 'rxjs'; import { map, Observable } from 'rxjs';
import { StateService } from 'src/app/services/state.service';
import { INodesRanking, ITopNodesPerChannels } from '../../../interfaces/node-api.interface'; import { INodesRanking, ITopNodesPerChannels } from '../../../interfaces/node-api.interface';
import { isMobile } from '../../../shared/common.utils';
import { GeolocationData } from '../../../shared/components/geolocation/geolocation.component'; import { GeolocationData } from '../../../shared/components/geolocation/geolocation.component';
import { LightningApiService } from '../../lightning-api.service'; import { LightningApiService } from '../../lightning-api.service';
@ -17,13 +17,17 @@ export class TopNodesPerChannels implements OnInit {
topNodesPerChannels$: Observable<ITopNodesPerChannels[]>; topNodesPerChannels$: Observable<ITopNodesPerChannels[]>;
skeletonRows: number[] = []; skeletonRows: number[] = [];
currency$: Observable<string>;
constructor( constructor(
private apiService: LightningApiService, private apiService: LightningApiService,
private stateService: StateService,
) {} ) {}
ngOnInit(): void { ngOnInit(): void {
for (let i = 1; i <= (this.widget ? (isMobile() ? 8 : 7) : 100); ++i) { this.currency$ = this.stateService.fiatCurrency$;
for (let i = 1; i <= (this.widget ? 6 : 100); ++i) {
this.skeletonRows.push(i); this.skeletonRows.push(i);
} }
@ -44,7 +48,15 @@ export class TopNodesPerChannels implements OnInit {
} else { } else {
this.topNodesPerChannels$ = this.nodes$.pipe( this.topNodesPerChannels$ = this.nodes$.pipe(
map((ranking) => { map((ranking) => {
return ranking.topByChannels.slice(0, isMobile() ? 8 : 7); for (const i in ranking.topByChannels) {
ranking.topByChannels[i].geolocation = <GeolocationData>{
country: ranking.topByChannels[i].country?.en,
city: ranking.topByChannels[i].city?.en,
subdivision: ranking.topByChannels[i].subdivision?.en,
iso: ranking.topByChannels[i].iso_code,
};
}
return ranking.topByChannels.slice(0, 6);
}) })
); );
} }

25
frontend/src/app/services/cache.service.ts
View File

@ -17,6 +17,7 @@ export class CacheService {
txCache: { [txid: string]: Transaction } = {}; txCache: { [txid: string]: Transaction } = {};
network: string;
blockCache: { [height: number]: BlockExtended } = {}; blockCache: { [height: number]: BlockExtended } = {};
blockLoading: { [height: number]: boolean } = {}; blockLoading: { [height: number]: boolean } = {};
copiesInBlockQueue: { [height: number]: number } = {}; copiesInBlockQueue: { [height: number]: number } = {};
@ -33,6 +34,10 @@ export class CacheService {
this.stateService.chainTip$.subscribe((height) => { this.stateService.chainTip$.subscribe((height) => {
this.tip = height; this.tip = height;
}); });
this.stateService.networkChanged$.subscribe((network) => {
this.network = network;
this.resetBlockCache();
});
} }
setTxCache(transactions) { setTxCache(transactions) {
@ -68,15 +73,17 @@ export class CacheService {
} catch (e) { } catch (e) {
console.log("failed to load blocks: ", e.message); console.log("failed to load blocks: ", e.message);
} }
for (let i = 0; i < chunkSize; i++) {
delete this.blockLoading[maxHeight - i];
}
if (result && result.length) { if (result && result.length) {
result.forEach(block => { result.forEach(block => {
this.addBlockToCache(block); if (this.blockLoading[block.height]) {
this.loadedBlocks$.next(block); this.addBlockToCache(block);
this.loadedBlocks$.next(block);
}
}); });
} }
for (let i = 0; i < chunkSize; i++) {
delete this.blockLoading[maxHeight - i];
}
this.clearBlocks(); this.clearBlocks();
} else { } else {
this.bumpBlockPriority(height); this.bumpBlockPriority(height);
@ -104,6 +111,14 @@ export class CacheService {
} }
} }
// remove all blocks from the cache
resetBlockCache() {
this.blockCache = {};
this.blockLoading = {};
this.copiesInBlockQueue = {};
this.blockPriorities = [];
}
getCachedBlock(height) { getCachedBlock(height) {
return this.blockCache[height]; return this.blockCache[height];
} }

2
frontend/src/app/services/price.service.ts
View File

@ -70,7 +70,7 @@ export class PriceService {
} }
getBlockPrice$(blockTimestamp: number, singlePrice = false): Observable<Price | undefined> { getBlockPrice$(blockTimestamp: number, singlePrice = false): Observable<Price | undefined> {
if (this.stateService.env.BASE_MODULE !== 'mempool') { if (this.stateService.env.BASE_MODULE !== 'mempool' || !this.stateService.env.HISTORICAL_PRICE) {
return of(undefined); return of(undefined);
} }

2
frontend/src/app/services/state.service.ts
View File

@ -43,6 +43,7 @@ export interface Env {
MAINNET_BLOCK_AUDIT_START_HEIGHT: number; MAINNET_BLOCK_AUDIT_START_HEIGHT: number;
TESTNET_BLOCK_AUDIT_START_HEIGHT: number; TESTNET_BLOCK_AUDIT_START_HEIGHT: number;
SIGNET_BLOCK_AUDIT_START_HEIGHT: number; SIGNET_BLOCK_AUDIT_START_HEIGHT: number;
HISTORICAL_PRICE: boolean;
} }
const defaultEnv: Env = { const defaultEnv: Env = {
@ -72,6 +73,7 @@ const defaultEnv: Env = {
'MAINNET_BLOCK_AUDIT_START_HEIGHT': 0, 'MAINNET_BLOCK_AUDIT_START_HEIGHT': 0,
'TESTNET_BLOCK_AUDIT_START_HEIGHT': 0, 'TESTNET_BLOCK_AUDIT_START_HEIGHT': 0,
'SIGNET_BLOCK_AUDIT_START_HEIGHT': 0, 'SIGNET_BLOCK_AUDIT_START_HEIGHT': 0,
'HISTORICAL_PRICE': true,
}; };
@Injectable({ @Injectable({

513
frontend/src/locale/messages.ar.xlf
View File

File diff suppressed because it is too large Load Diff

520
frontend/src/locale/messages.de.xlf
View File

File diff suppressed because it is too large Load Diff

531
frontend/src/locale/messages.fa.xlf
View File

File diff suppressed because it is too large Load Diff

854
frontend/src/locale/messages.fi.xlf
View File

File diff suppressed because it is too large Load Diff

688
frontend/src/locale/messages.fr.xlf
View File

File diff suppressed because it is too large Load Diff

797
frontend/src/locale/messages.hu.xlf
View File

File diff suppressed because it is too large Load Diff

657
frontend/src/locale/messages.it.xlf
View File

File diff suppressed because it is too large Load Diff

649
frontend/src/locale/messages.mk.xlf
View File

File diff suppressed because it is too large Load Diff

818
frontend/src/locale/messages.nb.xlf
View File

File diff suppressed because it is too large Load Diff

717
frontend/src/locale/messages.pt.xlf
View File

File diff suppressed because it is too large Load Diff

818
frontend/src/locale/messages.ro.xlf
View File

File diff suppressed because it is too large Load Diff

700
frontend/src/locale/messages.ru.xlf
View File

File diff suppressed because it is too large Load Diff

837
frontend/src/locale/messages.uk.xlf
View File

File diff suppressed because it is too large Load Diff

688
frontend/src/locale/messages.vi.xlf
View File

File diff suppressed because it is too large Load Diff

BIN
frontend/src/resources/mempool-promo.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 46 KiB

11
frontend/sync-assets.js
View File

@ -51,7 +51,7 @@ function downloadMiningPoolLogos() {
response.on('data', (fragments) => { response.on('data', (fragments) => {
chunks_of_data.push(fragments); chunks_of_data.push(fragments);
}); });
response.on('end', () => { response.on('end', () => {
let response_body = Buffer.concat(chunks_of_data); let response_body = Buffer.concat(chunks_of_data);
try { try {
@ -63,7 +63,7 @@ function downloadMiningPoolLogos() {
console.error(`Unable to download mining pool logos. Trying again at next restart. Reason: ${e instanceof Error ? e.message : e}`); console.error(`Unable to download mining pool logos. Trying again at next restart. Reason: ${e instanceof Error ? e.message : e}`);
} }
}); });
response.on('error', (error) => { response.on('error', (error) => {
throw new Error(error); throw new Error(error);
}); });
@ -81,6 +81,9 @@ if (configContent.BASE_MODULE && configContent.BASE_MODULE === 'liquid') {
const testnetAssetsJsonUrl = 'https://raw.githubusercontent.com/Blockstream/asset_registry_testnet_db/master/index.json'; const testnetAssetsJsonUrl = 'https://raw.githubusercontent.com/Blockstream/asset_registry_testnet_db/master/index.json';
const testnetAssetsMinimalJsonUrl = 'https://raw.githubusercontent.com/Blockstream/asset_registry_testnet_db/master/index.minimal.json'; const testnetAssetsMinimalJsonUrl = 'https://raw.githubusercontent.com/Blockstream/asset_registry_testnet_db/master/index.minimal.json';
const promoVideo = PATH + 'mempool-promo.mp4';
const promoVideoUrl = 'https://raw.githubusercontent.com/mempool/mempool-promo/master/promo.mp4';
console.log('Downloading assets'); console.log('Downloading assets');
download(PATH + 'assets.json', assetsJsonUrl); download(PATH + 'assets.json', assetsJsonUrl);
console.log('Downloading assets minimal'); console.log('Downloading assets minimal');
@ -89,5 +92,9 @@ console.log('Downloading testnet assets');
download(PATH + 'assets-testnet.json', testnetAssetsJsonUrl); download(PATH + 'assets-testnet.json', testnetAssetsJsonUrl);
console.log('Downloading testnet assets minimal'); console.log('Downloading testnet assets minimal');
download(PATH + 'assets-testnet.minimal.json', testnetAssetsMinimalJsonUrl); download(PATH + 'assets-testnet.minimal.json', testnetAssetsMinimalJsonUrl);
if (!fs.existsSync(promoVideo)) {
console.log('Downloading promo video');
download(promoVideo, promoVideoUrl);
}
console.log('Downloading mining pool logos'); console.log('Downloading mining pool logos');
downloadMiningPoolLogos(); downloadMiningPoolLogos();

2
production/mempool-build-all
View File

@ -38,7 +38,7 @@ update_repo()
cd "$HOME/${site}" || exit 1 cd "$HOME/${site}" || exit 1
git fetch origin || exit 1 git fetch origin || exit 1
for remote in origin hunicus mononaut;do for remote in origin;do
git remote add "${remote}" "https://github.com/${remote}/mempool" >/dev/null 2>&1 git remote add "${remote}" "https://github.com/${remote}/mempool" >/dev/null 2>&1
git fetch "${remote}" || exit 1 git fetch "${remote}" || exit 1
done done

2
production/mempool-config.mainnet.json
View File

@ -13,7 +13,7 @@
"AUDIT": true, "AUDIT": true,
"CPFP_INDEXING": true, "CPFP_INDEXING": true,
"ADVANCED_GBT_AUDIT": true, "ADVANCED_GBT_AUDIT": true,
"ADVANCED_GBT_MEMPOOL": false, "ADVANCED_GBT_MEMPOOL": true,
"USE_SECOND_NODE_FOR_MINFEE": true "USE_SECOND_NODE_FOR_MINFEE": true
}, },
"SYSLOG" : { "SYSLOG" : {

2
production/mempool-config.signet.json
View File

@ -9,7 +9,7 @@
"INDEXING_BLOCKS_AMOUNT": -1, "INDEXING_BLOCKS_AMOUNT": -1,
"AUDIT": true, "AUDIT": true,
"ADVANCED_GBT_AUDIT": true, "ADVANCED_GBT_AUDIT": true,
"ADVANCED_GBT_MEMPOOL": false, "ADVANCED_GBT_MEMPOOL": true,
"POLL_RATE_MS": 1000 "POLL_RATE_MS": 1000
}, },
"SYSLOG" : { "SYSLOG" : {

2
production/mempool-config.testnet.json
View File

@ -9,7 +9,7 @@
"INDEXING_BLOCKS_AMOUNT": -1, "INDEXING_BLOCKS_AMOUNT": -1,
"AUDIT": true, "AUDIT": true,
"ADVANCED_GBT_AUDIT": true, "ADVANCED_GBT_AUDIT": true,
"ADVANCED_GBT_MEMPOOL": false, "ADVANCED_GBT_MEMPOOL": true,
"POLL_RATE_MS": 1000 "POLL_RATE_MS": 1000
}, },
"SYSLOG" : { "SYSLOG" : {

2
production/nginx-cache-warmer
View File

@ -1,6 +1,6 @@
#!/usr/bin/env zsh #!/usr/bin/env zsh
hostname=$(hostname) hostname=$(hostname)
slugs=(`curl -sSL https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json | jq -r '.slugs[]'`) slugs=(`curl -sSL https://${hostname}/api/v1/mining/pools/3y|jq -r -S '(.pools[].slug)'`)
warm() warm()
{ {