From 42a222338b3d64b1bd31e80cc2bb35c751ffcca2 Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Wed, 6 Sep 2023 22:42:33 +0900 Subject: [PATCH 01/17] Add missing meta descriptions --- frontend/src/app/components/asset/asset.component.ts | 1 + .../hashrates-chart-pools/hashrate-chart-pools.component.ts | 1 + .../nodes-per-isp-chart/nodes-per-isp-chart.component.ts | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/components/asset/asset.component.ts b/frontend/src/app/components/asset/asset.component.ts index 562ebff53..dd09468cc 100644 --- a/frontend/src/app/components/asset/asset.component.ts +++ b/frontend/src/app/components/asset/asset.component.ts @@ -105,6 +105,7 @@ export class AssetComponent implements OnInit, OnDestroy { if (!this.assetContract) { this.assetContract = [null, '?', 'Unknown', 0]; } + this.seoService.setDescription($localize`:@@meta.description.liquid.asset:Browse an overview of the Liquid asset ${this.assetContract[2]}:INTERPOLATION: (${this.assetContract[1]}:INTERPOLATION:): see issued amount, burned amount, circulating amount, related transactions, and more.`); this.blindedIssuance = this.asset.chain_stats.has_blinded_issuances || this.asset.mempool_stats.has_blinded_issuances; this.isNativeAsset = asset.asset_id === this.nativeAssetId; this.updateChainStats(); diff --git a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts index e7e3685d3..efe43c0c0 100644 --- a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts +++ b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts @@ -62,6 +62,7 @@ export class HashrateChartPoolsComponent implements OnInit { let firstRun = true; this.seoService.setTitle($localize`:@@mining.pools-historical-dominance:Pools Historical Dominance`); + this.seoService.setDescription($localize`:@@meta.descriptions.bitcoin.graphs.hashrate-pools:See Bitcoin mining pool dominance visualized over time: see how top mining pools' share of total hashrate has fluctuated over time.`); this.miningWindowPreference = this.miningService.getDefaultTimespan('6m'); this.radioGroupForm = this.formBuilder.group({ dateSpan: this.miningWindowPreference }); this.radioGroupForm.controls.dateSpan.setValue(this.miningWindowPreference); diff --git a/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts b/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts index 67f393bc2..8853f9f66 100644 --- a/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts +++ b/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts @@ -50,6 +50,7 @@ export class NodesPerISPChartComponent implements OnInit { ngOnInit(): void { if (!this.widget) { this.seoService.setTitle($localize`:@@8573a1576789bd2c4faeaed23037c4917812c6cf:Lightning Nodes Per ISP`); + this.seoService.setDescription($localize`:@@meta.description.lightning.nodes-per-isp:Browse the top 100 ISPs hosting Lightning nodes along with stats like total number of nodes per ISP, aggregate BTC capacity per ISP, and more`); } this.nodesPerAsObservable$ = combineLatest([ @@ -105,7 +106,7 @@ export class NodesPerISPChartComponent implements OnInit { ); if (this.widget) { - this.sortBySubject.next(false); + this.sortBySubject.next(false); } } From 572f6bdbac667fde415e840b62f649f8c714d042 Mon Sep 17 00:00:00 2001 From: hunicus <93150691+hunicus@users.noreply.github.com> Date: Wed, 6 Sep 2023 22:42:58 +0900 Subject: [PATCH 02/17] Fix mining dashboard meta description not showing --- .../blocks-list/blocks-list.component.ts | 14 ++++++-------- .../mining-dashboard/mining-dashboard.component.ts | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/frontend/src/app/components/blocks-list/blocks-list.component.ts b/frontend/src/app/components/blocks-list/blocks-list.component.ts index aa361d9dc..3cebc832d 100644 --- a/frontend/src/app/components/blocks-list/blocks-list.component.ts +++ b/frontend/src/app/components/blocks-list/blocks-list.component.ts @@ -48,19 +48,17 @@ export class BlocksList implements OnInit { if (!this.widget) { this.websocketService.want(['blocks']); + this.seoService.setTitle($localize`:@@meta.title.blocks-list:Blocks`); + if( this.stateService.network==='liquid'||this.stateService.network==='liquidtestnet' ) { + this.seoService.setDescription($localize`:@@meta.description.liquid.blocks:See the most recent Liquid${seoDescriptionNetwork(this.stateService.network)} blocks along with basic stats such as block height, block size, and more.`); + } else { + this.seoService.setDescription($localize`:@@meta.description.bitcoin.blocks:See the most recent Bitcoin${seoDescriptionNetwork(this.stateService.network)} blocks along with basic stats such as block height, block reward, block size, and more.`); + } } this.skeletonLines = this.widget === true ? [...Array(6).keys()] : [...Array(15).keys()]; this.paginationMaxSize = window.matchMedia('(max-width: 670px)').matches ? 3 : 5; - this.seoService.setTitle($localize`:@@meta.title.blocks-list:Blocks`); - if( this.stateService.network==='liquid'||this.stateService.network==='liquidtestnet' ) { - this.seoService.setDescription($localize`:@@meta.description.liquid.blocks:See the most recent Liquid${seoDescriptionNetwork(this.stateService.network)} blocks along with basic stats such as block height, block size, and more.`); - } else { - this.seoService.setDescription($localize`:@@meta.description.bitcoin.blocks:See the most recent Bitcoin${seoDescriptionNetwork(this.stateService.network)} blocks along with basic stats such as block height, block reward, block size, and more.`); - } - - this.blocks$ = combineLatest([ this.fromHeightSubject.pipe( switchMap((fromBlockHeight) => { diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts index b3b2093ce..c523bec04 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts @@ -17,12 +17,12 @@ export class MiningDashboardComponent implements OnInit, AfterViewInit { private stateService: StateService, private router: Router ) { - this.seoService.setTitle($localize`:@@a681a4e2011bb28157689dbaa387de0dd0aa0c11:Mining Dashboard`); - this.seoService.setDescription($localize`:@@meta.description.mining.dashboard:Get real-time Bitcoin mining stats like hashrate, difficulty adjustment, block rewards, pool dominance, and more.`); } ngOnInit(): void { this.websocketService.want(['blocks', 'mempool-blocks', 'stats']); + this.seoService.setTitle($localize`:@@a681a4e2011bb28157689dbaa387de0dd0aa0c11:Mining Dashboard`); + this.seoService.setDescription($localize`:@@meta.description.mining.dashboard:Get real-time Bitcoin mining stats like hashrate, difficulty adjustment, block rewards, pool dominance, and more.`); } ngAfterViewInit(): void { From 60996a99f00af0cf03e230d4cb11df9450e900dc Mon Sep 17 00:00:00 2001 From: softsimon Date: Sun, 17 Mar 2024 18:22:38 +0900 Subject: [PATCH 03/17] Removing Bisq --- backend/mempool-config.sample.json | 8 +- .../__fixtures__/mempool-config.template.json | 8 +- backend/src/__tests__/config.test.ts | 8 +- backend/src/api/bisq/bisq.routes.ts | 381 ----- backend/src/api/bisq/bisq.ts | 359 ----- backend/src/api/bisq/interfaces.ts | 258 ---- backend/src/api/bisq/markets-api.ts | 679 -------- backend/src/api/bisq/markets.ts | 137 -- backend/src/api/bisq/strtotime.ts | 1375 ----------------- backend/src/api/bitcoin/bitcoin.routes.ts | 4 +- backend/src/api/websocket-handler.ts | 8 - backend/src/config.ts | 16 +- backend/src/index.ts | 13 - backend/src/logger.ts | 3 - backend/src/mempool.interfaces.ts | 1 - docker/README.md | 19 - docker/backend/mempool-config.json | 8 +- docker/backend/start.sh | 11 - docker/frontend/entrypoint.sh | 6 - frontend/README.md | 3 +- frontend/mempool-frontend-config.sample.json | 3 - frontend/package.json | 16 +- frontend/proxy.conf.js | 11 - frontend/proxy.conf.local-esplora.js | 34 - frontend/proxy.conf.local.js | 34 - frontend/proxy.conf.mixed.js | 33 - frontend/proxy.conf.staging.js | 1 - frontend/src/app/app-routing.module.ts | 7 - .../bisq-address/bisq-address.component.html | 108 -- .../bisq-address/bisq-address.component.scss | 75 - .../bisq-address/bisq-address.component.ts | 89 -- frontend/src/app/bisq/bisq-api.service.ts | 78 - .../bisq/bisq-block/bisq-block.component.html | 114 -- .../bisq/bisq-block/bisq-block.component.scss | 44 - .../bisq/bisq-block/bisq-block.component.ts | 106 -- .../bisq-blocks/bisq-blocks.component.html | 40 - .../bisq-blocks/bisq-blocks.component.scss | 6 - .../bisq/bisq-blocks/bisq-blocks.component.ts | 91 -- .../bisq-dashboard.component.html | 63 - .../bisq-dashboard.component.scss | 22 - .../bisq-dashboard.component.ts | 132 -- .../bisq/bisq-icon/bisq-icon.component.html | 1 - .../bisq/bisq-icon/bisq-icon.component.scss | 0 .../app/bisq/bisq-icon/bisq-icon.component.ts | 87 -- .../bisq-main-dashboard.component.html | 124 -- .../bisq-main-dashboard.component.scss | 112 -- .../bisq-main-dashboard.component.ts | 193 --- .../bisq-market/bisq-market.component.html | 112 -- .../bisq-market/bisq-market.component.scss | 46 - .../bisq/bisq-market/bisq-market.component.ts | 159 -- .../bisq/bisq-stats/bisq-stats.component.html | 86 -- .../bisq/bisq-stats/bisq-stats.component.scss | 18 - .../bisq/bisq-stats/bisq-stats.component.ts | 42 - .../bisq-trades/bisq-trades.component.html | 46 - .../bisq-trades/bisq-trades.component.scss | 38 - .../bisq/bisq-trades/bisq-trades.component.ts | 22 - .../bisq-transaction-details.component.html | 36 - .../bisq-transaction-details.component.scss | 22 - .../bisq-transaction-details.component.ts | 26 - .../bisq-transaction.component.html | 216 --- .../bisq-transaction.component.ts | 130 -- .../bisq-transactions.component.html | 56 - .../bisq-transactions.component.scss | 23 - .../bisq-transactions.component.ts | 166 -- .../bisq-transfers.component.html | 83 - .../bisq-transfers.component.scss | 103 -- .../bisq-transfers.component.ts | 42 - frontend/src/app/bisq/bisq.interfaces.ts | 261 ---- frontend/src/app/bisq/bisq.module.ts | 84 - frontend/src/app/bisq/bisq.routing.module.ts | 95 -- .../bisq/bsq-amount/bsq-amount.component.html | 6 - .../bisq/bsq-amount/bsq-amount.component.scss | 3 - .../bisq/bsq-amount/bsq-amount.component.ts | 30 - .../lightweight-charts-area.component.scss | 25 - .../lightweight-charts-area.component.ts | 151 -- .../lightweight-charts.component.scss | 0 .../lightweight-charts.component.ts | 94 -- .../src/app/components/app/app.component.ts | 2 - .../bisq-master-page.component.html | 91 -- .../bisq-master-page.component.scss | 172 --- .../bisq-master-page.component.ts | 50 - .../blockchain-blocks.component.ts | 1 - .../app/components/clock/clock.component.ts | 1 - .../liquid-master-page.component.html | 3 +- .../master-page-preview.component.html | 1 - .../preview-title.component.html | 1 - .../master-page/master-page.component.html | 5 +- .../privacy-policy.component.html | 2 +- .../search-form/search-form.component.ts | 14 +- .../svg-images/svg-images.component.html | 3 - .../terms-of-service.component.html | 4 +- .../tx-bowtie-graph.component.ts | 1 - .../src/app/docs/api-docs/api-docs-data.ts | 904 +---------- .../app/docs/api-docs/api-docs.component.html | 2 +- .../app/docs/api-docs/api-docs.component.ts | 4 - .../code-template/code-template.component.ts | 50 +- frontend/src/app/docs/docs.routing.module.ts | 2 +- frontend/src/app/docs/docs/docs.component.ts | 7 +- .../src/app/interfaces/websocket.interface.ts | 1 - .../app/lightning/lightning-api.service.ts | 3 - frontend/src/app/services/api.service.ts | 3 - .../src/app/services/electrs-api.service.ts | 3 - .../src/app/services/enterprise.service.ts | 9 - .../src/app/services/navigation.service.ts | 9 +- frontend/src/app/services/seo.service.ts | 6 - .../src/app/services/services-api.service.ts | 3 - frontend/src/app/services/state.service.ts | 21 +- .../src/app/services/websocket.service.ts | 13 +- .../global-footer.component.html | 1 - .../global-footer/global-footer.component.ts | 3 - frontend/src/app/shared/regex.utils.ts | 36 +- frontend/src/index.bisq.html | 46 - .../resources/bisq/bisq-markets-preview.png | Bin 96581 -> 0 bytes .../bisq/favicons/android-chrome-192x192.png | Bin 9127 -> 0 bytes .../bisq/favicons/android-chrome-384x384.png | Bin 42124 -> 0 bytes .../bisq/favicons/apple-touch-icon.png | Bin 7340 -> 0 bytes .../resources/bisq/favicons/browserconfig.xml | 9 - .../resources/bisq/favicons/favicon-16x16.png | Bin 842 -> 0 bytes .../resources/bisq/favicons/favicon-32x32.png | Bin 1414 -> 0 bytes .../src/resources/bisq/favicons/favicon.ico | Bin 15086 -> 0 bytes .../bisq/favicons/mstile-150x150.png | Bin 4948 -> 0 bytes .../bisq/favicons/safari-pinned-tab.svg | 18 - .../resources/bisq/favicons/site.webmanifest | 19 - frontend/src/styles.scss | 2 +- 124 files changed, 51 insertions(+), 8624 deletions(-) delete mode 100644 backend/src/api/bisq/bisq.routes.ts delete mode 100644 backend/src/api/bisq/bisq.ts delete mode 100644 backend/src/api/bisq/interfaces.ts delete mode 100644 backend/src/api/bisq/markets-api.ts delete mode 100644 backend/src/api/bisq/markets.ts delete mode 100644 backend/src/api/bisq/strtotime.ts delete mode 100644 frontend/src/app/bisq/bisq-address/bisq-address.component.html delete mode 100644 frontend/src/app/bisq/bisq-address/bisq-address.component.scss delete mode 100644 frontend/src/app/bisq/bisq-address/bisq-address.component.ts delete mode 100644 frontend/src/app/bisq/bisq-api.service.ts delete mode 100644 frontend/src/app/bisq/bisq-block/bisq-block.component.html delete mode 100644 frontend/src/app/bisq/bisq-block/bisq-block.component.scss delete mode 100644 frontend/src/app/bisq/bisq-block/bisq-block.component.ts delete mode 100644 frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html delete mode 100644 frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.scss delete mode 100644 frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts delete mode 100644 frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.html delete mode 100644 frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.scss delete mode 100644 frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts delete mode 100644 frontend/src/app/bisq/bisq-icon/bisq-icon.component.html delete mode 100644 frontend/src/app/bisq/bisq-icon/bisq-icon.component.scss delete mode 100644 frontend/src/app/bisq/bisq-icon/bisq-icon.component.ts delete mode 100644 frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html delete mode 100644 frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.scss delete mode 100644 frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.ts delete mode 100644 frontend/src/app/bisq/bisq-market/bisq-market.component.html delete mode 100644 frontend/src/app/bisq/bisq-market/bisq-market.component.scss delete mode 100644 frontend/src/app/bisq/bisq-market/bisq-market.component.ts delete mode 100644 frontend/src/app/bisq/bisq-stats/bisq-stats.component.html delete mode 100644 frontend/src/app/bisq/bisq-stats/bisq-stats.component.scss delete mode 100644 frontend/src/app/bisq/bisq-stats/bisq-stats.component.ts delete mode 100644 frontend/src/app/bisq/bisq-trades/bisq-trades.component.html delete mode 100644 frontend/src/app/bisq/bisq-trades/bisq-trades.component.scss delete mode 100644 frontend/src/app/bisq/bisq-trades/bisq-trades.component.ts delete mode 100644 frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html delete mode 100644 frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.scss delete mode 100644 frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.ts delete mode 100644 frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html delete mode 100644 frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts delete mode 100644 frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html delete mode 100644 frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.scss delete mode 100644 frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts delete mode 100644 frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html delete mode 100644 frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.scss delete mode 100644 frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.ts delete mode 100644 frontend/src/app/bisq/bisq.interfaces.ts delete mode 100644 frontend/src/app/bisq/bisq.module.ts delete mode 100644 frontend/src/app/bisq/bisq.routing.module.ts delete mode 100644 frontend/src/app/bisq/bsq-amount/bsq-amount.component.html delete mode 100644 frontend/src/app/bisq/bsq-amount/bsq-amount.component.scss delete mode 100644 frontend/src/app/bisq/bsq-amount/bsq-amount.component.ts delete mode 100644 frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.scss delete mode 100644 frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts delete mode 100644 frontend/src/app/bisq/lightweight-charts/lightweight-charts.component.scss delete mode 100644 frontend/src/app/bisq/lightweight-charts/lightweight-charts.component.ts delete mode 100644 frontend/src/app/components/bisq-master-page/bisq-master-page.component.html delete mode 100644 frontend/src/app/components/bisq-master-page/bisq-master-page.component.scss delete mode 100644 frontend/src/app/components/bisq-master-page/bisq-master-page.component.ts delete mode 100644 frontend/src/index.bisq.html delete mode 100644 frontend/src/resources/bisq/bisq-markets-preview.png delete mode 100644 frontend/src/resources/bisq/favicons/android-chrome-192x192.png delete mode 100644 frontend/src/resources/bisq/favicons/android-chrome-384x384.png delete mode 100644 frontend/src/resources/bisq/favicons/apple-touch-icon.png delete mode 100644 frontend/src/resources/bisq/favicons/browserconfig.xml delete mode 100644 frontend/src/resources/bisq/favicons/favicon-16x16.png delete mode 100644 frontend/src/resources/bisq/favicons/favicon-32x32.png delete mode 100644 frontend/src/resources/bisq/favicons/favicon.ico delete mode 100644 frontend/src/resources/bisq/favicons/mstile-150x150.png delete mode 100644 frontend/src/resources/bisq/favicons/safari-pinned-tab.svg delete mode 100644 frontend/src/resources/bisq/favicons/site.webmanifest diff --git a/backend/mempool-config.sample.json b/backend/mempool-config.sample.json index cac5d2e61..fb88c2d07 100644 --- a/backend/mempool-config.sample.json +++ b/backend/mempool-config.sample.json @@ -98,10 +98,6 @@ "GEOLITE2_ASN": "/usr/local/share/GeoIP/GeoLite2-ASN.mmdb", "GEOIP2_ISP": "/usr/local/share/GeoIP/GeoIP2-ISP.mmdb" }, - "BISQ": { - "ENABLED": false, - "DATA_PATH": "/bisq/statsnode-data/btc_mainnet/db" - }, "LIGHTNING": { "ENABLED": false, "BACKEND": "lnd", @@ -132,9 +128,7 @@ "MEMPOOL_API": "https://mempool.space/api/v1", "MEMPOOL_ONION": "http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1", "LIQUID_API": "https://liquid.network/api/v1", - "LIQUID_ONION": "http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1", - "BISQ_URL": "https://bisq.markets/api", - "BISQ_ONION": "http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api" + "LIQUID_ONION": "http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1" }, "REDIS": { "ENABLED": false, diff --git a/backend/src/__fixtures__/mempool-config.template.json b/backend/src/__fixtures__/mempool-config.template.json index 5cbff22a3..58ff5a854 100644 --- a/backend/src/__fixtures__/mempool-config.template.json +++ b/backend/src/__fixtures__/mempool-config.template.json @@ -94,10 +94,6 @@ "ENABLED": false, "TX_PER_SECOND_SAMPLE_PERIOD": 20 }, - "BISQ": { - "ENABLED": true, - "DATA_PATH": "__BISQ_DATA_PATH__" - }, "SOCKS5PROXY": { "ENABLED": true, "USE_ONION": true, @@ -110,9 +106,7 @@ "MEMPOOL_API": "__EXTERNAL_DATA_SERVER_MEMPOOL_API__", "MEMPOOL_ONION": "__EXTERNAL_DATA_SERVER_MEMPOOL_ONION__", "LIQUID_API": "__EXTERNAL_DATA_SERVER_LIQUID_API__", - "LIQUID_ONION": "__EXTERNAL_DATA_SERVER_LIQUID_ONION__", - "BISQ_URL": "__EXTERNAL_DATA_SERVER_BISQ_URL__", - "BISQ_ONION": "__EXTERNAL_DATA_SERVER_BISQ_ONION__" + "LIQUID_ONION": "__EXTERNAL_DATA_SERVER_LIQUID_ONION__" }, "LIGHTNING": { "ENABLED": true, diff --git a/backend/src/__tests__/config.test.ts b/backend/src/__tests__/config.test.ts index e261e2adc..f30d7df4f 100644 --- a/backend/src/__tests__/config.test.ts +++ b/backend/src/__tests__/config.test.ts @@ -108,8 +108,6 @@ describe('Mempool Backend Config', () => { expect(config.STATISTICS).toStrictEqual({ ENABLED: true, TX_PER_SECOND_SAMPLE_PERIOD: 150 }); - expect(config.BISQ).toStrictEqual({ ENABLED: false, DATA_PATH: '/bisq/statsnode-data/btc_mainnet/db' }); - expect(config.SOCKS5PROXY).toStrictEqual({ ENABLED: false, USE_ONION: true, @@ -123,9 +121,7 @@ describe('Mempool Backend Config', () => { MEMPOOL_API: 'https://mempool.space/api/v1', MEMPOOL_ONION: 'http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1', LIQUID_API: 'https://liquid.network/api/v1', - LIQUID_ONION: 'http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1', - BISQ_URL: 'https://bisq.markets/api', - BISQ_ONION: 'http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api' + LIQUID_ONION: 'http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1' }); expect(config.MAXMIND).toStrictEqual({ @@ -183,8 +179,6 @@ describe('Mempool Backend Config', () => { expect(config.STATISTICS).toStrictEqual(fixture.STATISTICS); - expect(config.BISQ).toStrictEqual(fixture.BISQ); - expect(config.SOCKS5PROXY).toStrictEqual(fixture.SOCKS5PROXY); expect(config.EXTERNAL_DATA_SERVER).toStrictEqual(fixture.EXTERNAL_DATA_SERVER); diff --git a/backend/src/api/bisq/bisq.routes.ts b/backend/src/api/bisq/bisq.routes.ts deleted file mode 100644 index 8f002836f..000000000 --- a/backend/src/api/bisq/bisq.routes.ts +++ /dev/null @@ -1,381 +0,0 @@ -import { Application, Request, Response } from 'express'; -import config from '../../config'; -import { RequiredSpec } from '../../mempool.interfaces'; -import bisq from './bisq'; -import { MarketsApiError } from './interfaces'; -import marketsApi from './markets-api'; - -class BisqRoutes { - public initRoutes(app: Application) { - app - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/stats', this.getBisqStats) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/tx/:txId', this.getBisqTransaction) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/block/:hash', this.getBisqBlock) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/blocks/tip/height', this.getBisqTip) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/blocks/:index/:length', this.getBisqBlocks) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/address/:address', this.getBisqAddress) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/txs/:index/:length', this.getBisqTransactions) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/currencies', this.getBisqMarketCurrencies.bind(this)) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/depth', this.getBisqMarketDepth.bind(this)) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/hloc', this.getBisqMarketHloc.bind(this)) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/markets', this.getBisqMarketMarkets.bind(this)) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/offers', this.getBisqMarketOffers.bind(this)) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/ticker', this.getBisqMarketTicker.bind(this)) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/trades', this.getBisqMarketTrades.bind(this)) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/volumes', this.getBisqMarketVolumes.bind(this)) - .get(config.MEMPOOL.API_URL_PREFIX + 'bisq/markets/volumes/7d', this.getBisqMarketVolumes7d.bind(this)) - ; - } - - - private getBisqStats(req: Request, res: Response) { - const result = bisq.getStats(); - res.json(result); - } - - private getBisqTip(req: Request, res: Response) { - const result = bisq.getLatestBlockHeight(); - res.type('text/plain'); - res.send(result.toString()); - } - - private getBisqTransaction(req: Request, res: Response) { - const result = bisq.getTransaction(req.params.txId); - if (result) { - res.json(result); - } else { - res.status(404).send('Bisq transaction not found'); - } - } - - private getBisqTransactions(req: Request, res: Response) { - const types: string[] = []; - req.query.types = req.query.types || []; - if (!Array.isArray(req.query.types)) { - res.status(500).send('Types is not an array'); - return; - } - - for (const _type in req.query.types) { - if (typeof req.query.types[_type] === 'string') { - types.push(req.query.types[_type].toString()); - } - } - - const index = parseInt(req.params.index, 10) || 0; - const length = parseInt(req.params.length, 10) > 100 ? 100 : parseInt(req.params.length, 10) || 25; - const [transactions, count] = bisq.getTransactions(index, length, types); - res.header('X-Total-Count', count.toString()); - res.json(transactions); - } - - private getBisqBlock(req: Request, res: Response) { - const result = bisq.getBlock(req.params.hash); - if (result) { - res.json(result); - } else { - res.status(404).send('Bisq block not found'); - } - } - - private getBisqBlocks(req: Request, res: Response) { - const index = parseInt(req.params.index, 10) || 0; - const length = parseInt(req.params.length, 10) > 100 ? 100 : parseInt(req.params.length, 10) || 25; - const [transactions, count] = bisq.getBlocks(index, length); - res.header('X-Total-Count', count.toString()); - res.json(transactions); - } - - private getBisqAddress(req: Request, res: Response) { - const result = bisq.getAddress(req.params.address.substr(1)); - if (result) { - res.json(result); - } else { - res.status(404).send('Bisq address not found'); - } - } - - private getBisqMarketCurrencies(req: Request, res: Response) { - const constraints: RequiredSpec = { - 'type': { - required: false, - types: ['crypto', 'fiat', 'all'] - }, - }; - - const p = this.parseRequestParameters(req.query, constraints); - if (p.error) { - res.status(400).json(this.getBisqMarketErrorResponse(p.error)); - return; - } - - const result = marketsApi.getCurrencies(p.type); - if (result) { - res.json(result); - } else { - res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketCurrencies error')); - } - } - - private getBisqMarketDepth(req: Request, res: Response) { - const constraints: RequiredSpec = { - 'market': { - required: true, - types: ['@string'] - }, - }; - - const p = this.parseRequestParameters(req.query, constraints); - if (p.error) { - res.status(400).json(this.getBisqMarketErrorResponse(p.error)); - return; - } - - const result = marketsApi.getDepth(p.market); - if (result) { - res.json(result); - } else { - res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketDepth error')); - } - } - - private getBisqMarketMarkets(req: Request, res: Response) { - const result = marketsApi.getMarkets(); - if (result) { - res.json(result); - } else { - res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketMarkets error')); - } - } - - private getBisqMarketTrades(req: Request, res: Response) { - const constraints: RequiredSpec = { - 'market': { - required: true, - types: ['@string'] - }, - 'timestamp_from': { - required: false, - types: ['@number'] - }, - 'timestamp_to': { - required: false, - types: ['@number'] - }, - 'trade_id_to': { - required: false, - types: ['@string'] - }, - 'trade_id_from': { - required: false, - types: ['@string'] - }, - 'direction': { - required: false, - types: ['buy', 'sell'] - }, - 'limit': { - required: false, - types: ['@number'] - }, - 'sort': { - required: false, - types: ['asc', 'desc'] - } - }; - - const p = this.parseRequestParameters(req.query, constraints); - if (p.error) { - res.status(400).json(this.getBisqMarketErrorResponse(p.error)); - return; - } - - const result = marketsApi.getTrades(p.market, p.timestamp_from, - p.timestamp_to, p.trade_id_from, p.trade_id_to, p.direction, p.limit, p.sort); - if (result) { - res.json(result); - } else { - res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketTrades error')); - } - } - - private getBisqMarketOffers(req: Request, res: Response) { - const constraints: RequiredSpec = { - 'market': { - required: true, - types: ['@string'] - }, - 'direction': { - required: false, - types: ['buy', 'sell'] - }, - }; - - const p = this.parseRequestParameters(req.query, constraints); - if (p.error) { - res.status(400).json(this.getBisqMarketErrorResponse(p.error)); - return; - } - - const result = marketsApi.getOffers(p.market, p.direction); - if (result) { - res.json(result); - } else { - res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketOffers error')); - } - } - - private getBisqMarketVolumes(req: Request, res: Response) { - const constraints: RequiredSpec = { - 'market': { - required: false, - types: ['@string'] - }, - 'interval': { - required: false, - types: ['minute', 'half_hour', 'hour', 'half_day', 'day', 'week', 'month', 'year', 'auto'] - }, - 'timestamp_from': { - required: false, - types: ['@number'] - }, - 'timestamp_to': { - required: false, - types: ['@number'] - }, - 'milliseconds': { - required: false, - types: ['@boolean'] - }, - 'timestamp': { - required: false, - types: ['no', 'yes'] - }, - }; - - const p = this.parseRequestParameters(req.query, constraints); - if (p.error) { - res.status(400).json(this.getBisqMarketErrorResponse(p.error)); - return; - } - - const result = marketsApi.getVolumes(p.market, p.timestamp_from, p.timestamp_to, p.interval, p.milliseconds, p.timestamp); - if (result) { - res.json(result); - } else { - res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketVolumes error')); - } - } - - private getBisqMarketHloc(req: Request, res: Response) { - const constraints: RequiredSpec = { - 'market': { - required: true, - types: ['@string'] - }, - 'interval': { - required: false, - types: ['minute', 'half_hour', 'hour', 'half_day', 'day', 'week', 'month', 'year', 'auto'] - }, - 'timestamp_from': { - required: false, - types: ['@number'] - }, - 'timestamp_to': { - required: false, - types: ['@number'] - }, - 'milliseconds': { - required: false, - types: ['@boolean'] - }, - 'timestamp': { - required: false, - types: ['no', 'yes'] - }, - }; - - const p = this.parseRequestParameters(req.query, constraints); - if (p.error) { - res.status(400).json(this.getBisqMarketErrorResponse(p.error)); - return; - } - - const result = marketsApi.getHloc(p.market, p.interval, p.timestamp_from, p.timestamp_to, p.milliseconds, p.timestamp); - if (result) { - res.json(result); - } else { - res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketHloc error')); - } - } - - private getBisqMarketTicker(req: Request, res: Response) { - const constraints: RequiredSpec = { - 'market': { - required: false, - types: ['@string'] - }, - }; - - const p = this.parseRequestParameters(req.query, constraints); - if (p.error) { - res.status(400).json(this.getBisqMarketErrorResponse(p.error)); - return; - } - - const result = marketsApi.getTicker(p.market); - if (result) { - res.json(result); - } else { - res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketTicker error')); - } - } - - private getBisqMarketVolumes7d(req: Request, res: Response) { - const result = marketsApi.getVolumesByTime(604800); - if (result) { - res.json(result); - } else { - res.status(500).json(this.getBisqMarketErrorResponse('getBisqMarketVolumes7d error')); - } - } - - private parseRequestParameters(requestParams: object, params: RequiredSpec): { [name: string]: any; } { - const final = {}; - for (const i in params) { - if (params.hasOwnProperty(i)) { - if (params[i].required && requestParams[i] === undefined) { - return { error: i + ' parameter missing'}; - } - if (typeof requestParams[i] === 'string') { - const str = (requestParams[i] || '').toString().toLowerCase(); - if (params[i].types.indexOf('@number') > -1) { - const number = parseInt((str).toString(), 10); - final[i] = number; - } else if (params[i].types.indexOf('@string') > -1) { - final[i] = str; - } else if (params[i].types.indexOf('@boolean') > -1) { - final[i] = str === 'true' || str === 'yes'; - } else if (params[i].types.indexOf(str) > -1) { - final[i] = str; - } else { - return { error: i + ' parameter invalid'}; - } - } else if (typeof requestParams[i] === 'number') { - final[i] = requestParams[i]; - } - } - } - return final; - } - - private getBisqMarketErrorResponse(message: string): MarketsApiError { - return { - 'success': 0, - 'error': message - }; - } - -} - -export default new BisqRoutes; diff --git a/backend/src/api/bisq/bisq.ts b/backend/src/api/bisq/bisq.ts deleted file mode 100644 index 4171284bb..000000000 --- a/backend/src/api/bisq/bisq.ts +++ /dev/null @@ -1,359 +0,0 @@ -import config from '../../config'; -import * as fs from 'fs'; -import axios, { AxiosResponse } from 'axios'; -import * as http from 'http'; -import * as https from 'https'; -import { SocksProxyAgent } from 'socks-proxy-agent'; -import { BisqBlocks, BisqBlock, BisqTransaction, BisqStats, BisqTrade } from './interfaces'; -import { Common } from '../common'; -import { BlockExtended } from '../../mempool.interfaces'; -import backendInfo from '../backend-info'; -import logger from '../../logger'; - -class Bisq { - private static BLOCKS_JSON_FILE_PATH = config.BISQ.DATA_PATH + '/json/all/blocks.json'; - private latestBlockHeight = 0; - private blocks: BisqBlock[] = []; - private allBlocks: BisqBlock[] = []; - private transactions: BisqTransaction[] = []; - private transactionIndex: { [txId: string]: BisqTransaction } = {}; - private blockIndex: { [hash: string]: BisqBlock } = {}; - private addressIndex: { [address: string]: BisqTransaction[] } = {}; - private stats: BisqStats = { - minted: 0, - burnt: 0, - addresses: 0, - unspent_txos: 0, - spent_txos: 0, - }; - private price: number = 0; - private priceUpdateCallbackFunction: ((price: number) => void) | undefined; - private topDirectoryWatcher: fs.FSWatcher | undefined; - private subdirectoryWatcher: fs.FSWatcher | undefined; - - constructor() {} - - startBisqService(): void { - try { - this.checkForBisqDataFolder(); - } catch (e) { - logger.info('Retrying to start bisq service in 3 minutes'); - setTimeout(this.startBisqService.bind(this), 180000); - return; - } - this.loadBisqDumpFile(); - setInterval(this.updatePrice.bind(this), 1000 * 60 * 60); - this.updatePrice(); - this.startTopDirectoryWatcher(); - this.startSubDirectoryWatcher(); - } - - handleNewBitcoinBlock(block: BlockExtended): void { - if (block.height - 10 > this.latestBlockHeight && this.latestBlockHeight !== 0) { - logger.warn(`Bitcoin block height (#${block.height}) has diverged from the latest Bisq block height (#${this.latestBlockHeight}). Restarting watchers...`); - this.startTopDirectoryWatcher(); - this.startSubDirectoryWatcher(); - } - } - - getTransaction(txId: string): BisqTransaction | undefined { - return this.transactionIndex[txId]; - } - - getTransactions(start: number, length: number, types: string[]): [BisqTransaction[], number] { - let transactions = this.transactions; - if (types.length) { - transactions = transactions.filter((tx) => types.indexOf(tx.txType) > -1); - } - return [transactions.slice(start, length + start), transactions.length]; - } - - getBlock(hash: string): BisqBlock | undefined { - return this.blockIndex[hash]; - } - - getAddress(hash: string): BisqTransaction[] { - return this.addressIndex[hash]; - } - - getBlocks(start: number, length: number): [BisqBlock[], number] { - return [this.blocks.slice(start, length + start), this.blocks.length]; - } - - getStats(): BisqStats { - return this.stats; - } - - setPriceCallbackFunction(fn: (price: number) => void) { - this.priceUpdateCallbackFunction = fn; - } - - getLatestBlockHeight(): number { - return this.latestBlockHeight; - } - - private checkForBisqDataFolder() { - if (!fs.existsSync(Bisq.BLOCKS_JSON_FILE_PATH)) { - logger.warn(Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist. Make sure Bisq is running and the config is correct before starting the server.`); - throw new Error(`Cannot load BISQ ${Bisq.BLOCKS_JSON_FILE_PATH} file`); - } - } - - private startTopDirectoryWatcher() { - if (this.topDirectoryWatcher) { - this.topDirectoryWatcher.close(); - } - let fsWait: NodeJS.Timeout | null = null; - this.topDirectoryWatcher = fs.watch(config.BISQ.DATA_PATH + '/json', () => { - if (fsWait) { - clearTimeout(fsWait); - } - if (this.subdirectoryWatcher) { - this.subdirectoryWatcher.close(); - } - fsWait = setTimeout(() => { - logger.debug(`Bisq restart detected. Resetting both watchers in 3 minutes.`); - setTimeout(() => { - this.startTopDirectoryWatcher(); - this.startSubDirectoryWatcher(); - this.loadBisqDumpFile(); - }, 180000); - }, 15000); - }); - } - - private startSubDirectoryWatcher() { - if (this.subdirectoryWatcher) { - this.subdirectoryWatcher.close(); - } - if (!fs.existsSync(Bisq.BLOCKS_JSON_FILE_PATH)) { - logger.warn(Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist. Trying to restart sub directory watcher again in 3 minutes.`); - setTimeout(() => this.startSubDirectoryWatcher(), 180000); - return; - } - let fsWait: NodeJS.Timeout | null = null; - this.subdirectoryWatcher = fs.watch(config.BISQ.DATA_PATH + '/json/all', () => { - if (fsWait) { - clearTimeout(fsWait); - } - fsWait = setTimeout(() => { - logger.debug(`Change detected in the Bisq data folder.`); - this.loadBisqDumpFile(); - }, 2000); - }); - } - private async updatePrice() { - type axiosOptions = { - headers: { - 'User-Agent': string - }; - timeout: number; - httpAgent?: http.Agent; - httpsAgent?: https.Agent; - } - const setDelay = (secs: number = 1): Promise => new Promise(resolve => setTimeout(() => resolve(), secs * 1000)); - const BISQ_URL = (config.SOCKS5PROXY.ENABLED === true) && (config.SOCKS5PROXY.USE_ONION === true) ? config.EXTERNAL_DATA_SERVER.BISQ_ONION : config.EXTERNAL_DATA_SERVER.BISQ_URL; - const isHTTP = (new URL(BISQ_URL).protocol.split(':')[0] === 'http') ? true : false; - const axiosOptions: axiosOptions = { - headers: { - 'User-Agent': (config.MEMPOOL.USER_AGENT === 'mempool') ? `mempool/v${backendInfo.getBackendInfo().version}` : `${config.MEMPOOL.USER_AGENT}` - }, - timeout: config.SOCKS5PROXY.ENABLED ? 30000 : 10000 - }; - let retry = 0; - - while(retry < config.MEMPOOL.EXTERNAL_MAX_RETRY) { - try { - if (config.SOCKS5PROXY.ENABLED) { - const socksOptions: any = { - agentOptions: { - keepAlive: true, - }, - hostname: config.SOCKS5PROXY.HOST, - port: config.SOCKS5PROXY.PORT - }; - - if (config.SOCKS5PROXY.USERNAME && config.SOCKS5PROXY.PASSWORD) { - socksOptions.username = config.SOCKS5PROXY.USERNAME; - socksOptions.password = config.SOCKS5PROXY.PASSWORD; - } else { - // Retry with different tor circuits https://stackoverflow.com/a/64960234 - socksOptions.username = `circuit${retry}`; - } - - // Handle proxy agent for onion addresses - if (isHTTP) { - axiosOptions.httpAgent = new SocksProxyAgent(socksOptions); - } else { - axiosOptions.httpsAgent = new SocksProxyAgent(socksOptions); - } - } - - const data: AxiosResponse = await axios.get(`${BISQ_URL}/trades/?market=bsq_btc`, axiosOptions); - if (data.statusText === 'error' || !data.data) { - throw new Error(`Could not fetch data from Bisq market, Error: ${data.status}`); - } - const prices: number[] = []; - data.data.forEach((trade) => { - prices.push(parseFloat(trade.price) * 100000000); - }); - prices.sort((a, b) => a - b); - this.price = Common.median(prices); - if (this.priceUpdateCallbackFunction) { - this.priceUpdateCallbackFunction(this.price); - } - logger.debug('Successfully updated Bisq market price'); - break; - } catch (e) { - logger.err('Error updating Bisq market price: ' + (e instanceof Error ? e.message : e)); - await setDelay(config.MEMPOOL.EXTERNAL_RETRY_INTERVAL); - retry++; - } - } - } - - private async loadBisqDumpFile(): Promise { - this.allBlocks = []; - try { - await this.loadData(); - this.buildIndex(); - this.calculateStats(); - } catch (e) { - logger.info('Cannot load bisq dump file because: ' + (e instanceof Error ? e.message : e)); - } - } - - private buildIndex() { - const start = new Date().getTime(); - this.transactions = []; - this.transactionIndex = {}; - this.addressIndex = {}; - - this.allBlocks.forEach((block) => { - /* Build block index */ - if (!this.blockIndex[block.hash]) { - this.blockIndex[block.hash] = block; - } - - /* Build transactions index */ - block.txs.forEach((tx) => { - this.transactions.push(tx); - this.transactionIndex[tx.id] = tx; - }); - }); - - /* Build address index */ - this.transactions.forEach((tx) => { - tx.inputs.forEach((input) => { - if (!this.addressIndex[input.address]) { - this.addressIndex[input.address] = []; - } - if (this.addressIndex[input.address].indexOf(tx) === -1) { - this.addressIndex[input.address].push(tx); - } - }); - tx.outputs.forEach((output) => { - if (!this.addressIndex[output.address]) { - this.addressIndex[output.address] = []; - } - if (this.addressIndex[output.address].indexOf(tx) === -1) { - this.addressIndex[output.address].push(tx); - } - }); - }); - - const time = new Date().getTime() - start; - logger.debug('Bisq data index rebuilt in ' + time + ' ms'); - } - - private calculateStats() { - let minted = 0; - let burned = 0; - let unspent = 0; - let spent = 0; - - this.transactions.forEach((tx) => { - tx.outputs.forEach((output) => { - if (output.opReturn) { - return; - } - if (output.txOutputType === 'GENESIS_OUTPUT' || output.txOutputType === 'ISSUANCE_CANDIDATE_OUTPUT' && output.isVerified) { - minted += output.bsqAmount; - } - if (output.isUnspent) { - unspent++; - } else { - spent++; - } - }); - burned += tx['burntFee']; - }); - - this.stats = { - addresses: Object.keys(this.addressIndex).length, - minted: minted / 100, - burnt: burned / 100, - spent_txos: spent, - unspent_txos: unspent, - }; - } - - private async loadData(): Promise { - if (!fs.existsSync(Bisq.BLOCKS_JSON_FILE_PATH)) { - throw new Error(Bisq.BLOCKS_JSON_FILE_PATH + ` doesn't exist`); - } - - const readline = require('readline'); - const events = require('events'); - - const rl = readline.createInterface({ - input: fs.createReadStream(Bisq.BLOCKS_JSON_FILE_PATH), - crlfDelay: Infinity - }); - - let blockBuffer = ''; - let readingBlock = false; - let lineCount = 1; - const start = new Date().getTime(); - - logger.debug('Processing Bisq data dump...'); - - rl.on('line', (line) => { - if (lineCount === 2) { - line = line.replace(' "chainHeight": ', ''); - this.latestBlockHeight = parseInt(line, 10); - } - - if (line === ' {') { - readingBlock = true; - } else if (line === ' },') { - blockBuffer += '}'; - try { - const block: BisqBlock = JSON.parse(blockBuffer); - this.allBlocks.push(block); - readingBlock = false; - blockBuffer = ''; - } catch (e) { - logger.debug(blockBuffer); - throw Error(`Unable to parse Bisq data dump at line ${lineCount}` + (e instanceof Error ? e.message : e)); - } - } - - if (readingBlock === true) { - blockBuffer += line; - } - - ++lineCount; - }); - - await events.once(rl, 'close'); - - this.allBlocks.reverse(); - this.blocks = this.allBlocks.filter((block) => block.txs.length > 0); - - const time = new Date().getTime() - start; - logger.debug('Bisq dump processed in ' + time + ' ms'); - } -} - -export default new Bisq(); diff --git a/backend/src/api/bisq/interfaces.ts b/backend/src/api/bisq/interfaces.ts deleted file mode 100644 index eb10d2fa7..000000000 --- a/backend/src/api/bisq/interfaces.ts +++ /dev/null @@ -1,258 +0,0 @@ - -export interface BisqBlocks { - chainHeight: number; - blocks: BisqBlock[]; -} - -export interface BisqBlock { - height: number; - time: number; - hash: string; - previousBlockHash: string; - txs: BisqTransaction[]; -} - -export interface BisqTransaction { - txVersion: string; - id: string; - blockHeight: number; - blockHash: string; - time: number; - inputs: BisqInput[]; - outputs: BisqOutput[]; - txType: string; - txTypeDisplayString: string; - burntFee: number; - invalidatedBsq: number; - unlockBlockHeight: number; -} - -export interface BisqStats { - minted: number; - burnt: number; - addresses: number; - unspent_txos: number; - spent_txos: number; -} - -interface BisqInput { - spendingTxOutputIndex: number; - spendingTxId: string; - bsqAmount: number; - isVerified: boolean; - address: string; - time: number; -} - -interface BisqOutput { - txVersion: string; - txId: string; - index: number; - bsqAmount: number; - btcAmount: number; - height: number; - isVerified: boolean; - burntFee: number; - invalidatedBsq: number; - address: string; - scriptPubKey: BisqScriptPubKey; - time: any; - txType: string; - txTypeDisplayString: string; - txOutputType: string; - txOutputTypeDisplayString: string; - lockTime: number; - isUnspent: boolean; - spentInfo: SpentInfo; - opReturn?: string; -} - -interface BisqScriptPubKey { - addresses: string[]; - asm: string; - hex: string; - reqSigs?: number; - type: string; -} - -interface SpentInfo { - height: number; - inputIndex: number; - txId: string; -} - -export interface BisqTrade { - direction: string; - price: string; - amount: string; - volume: string; - payment_method: string; - trade_id: string; - trade_date: number; - market?: string; -} - -export interface Currencies { [txid: string]: Currency; } - -export interface Currency { - code: string; - name: string; - precision: number; - - _type: string; -} - -export interface Depth { [market: string]: Market; } - -interface Market { - 'buys': string[]; - 'sells': string[]; -} - -export interface HighLowOpenClose { - period_start: number | string; - open: string; - high: string; - low: string; - close: string; - volume_left: string; - volume_right: string; - avg: string; -} - -export interface Markets { [txid: string]: Pair; } - -interface Pair { - pair: string; - lname: string; - rname: string; - lsymbol: string; - rsymbol: string; - lprecision: number; - rprecision: number; - ltype: string; - rtype: string; - name: string; -} - -export interface Offers { [market: string]: OffersMarket; } - -interface OffersMarket { - buys: Offer[] | null; - sells: Offer[] | null; -} - -export interface OffersData { - direction: string; - currencyCode: string; - minAmount: number; - amount: number; - price: number; - date: number; - useMarketBasedPrice: boolean; - marketPriceMargin: number; - paymentMethod: string; - id: string; - currencyPair: string; - primaryMarketDirection: string; - priceDisplayString: string; - primaryMarketAmountDisplayString: string; - primaryMarketMinAmountDisplayString: string; - primaryMarketVolumeDisplayString: string; - primaryMarketMinVolumeDisplayString: string; - primaryMarketPrice: number; - primaryMarketAmount: number; - primaryMarketMinAmount: number; - primaryMarketVolume: number; - primaryMarketMinVolume: number; -} - -export interface Offer { - offer_id: string; - offer_date: number; - direction: string; - min_amount: string; - amount: string; - price: string; - volume: string; - payment_method: string; - offer_fee_txid: any; -} - -export interface Tickers { [market: string]: Ticker | null; } - -export interface Ticker { - last: string; - high: string; - low: string; - volume_left: string; - volume_right: string; - buy: string | null; - sell: string | null; -} - -export interface Trade { - direction: string; - price: string; - amount: string; - volume: string; - payment_method: string; - trade_id: string; - trade_date: number; -} - -export interface TradesData { - currency: string; - direction: string; - tradePrice: number; - tradeAmount: number; - tradeDate: number; - paymentMethod: string; - offerDate: number; - useMarketBasedPrice: boolean; - marketPriceMargin: number; - offerAmount: number; - offerMinAmount: number; - offerId: string; - depositTxId?: string; - currencyPair: string; - primaryMarketDirection: string; - primaryMarketTradePrice: number; - primaryMarketTradeAmount: number; - primaryMarketTradeVolume: number; - - _market: string; - _tradePriceStr: string; - _tradeAmountStr: string; - _tradeVolumeStr: string; - _offerAmountStr: string; - _tradePrice: number; - _tradeAmount: number; - _tradeVolume: number; - _offerAmount: number; -} - -export interface MarketVolume { - period_start: number; - num_trades: number; - volume: string; -} - -export interface MarketsApiError { - success: number; - error: string; -} - -export type Interval = 'minute' | 'half_hour' | 'hour' | 'half_day' | 'day' | 'week' | 'month' | 'year' | 'auto'; - -export interface SummarizedIntervals { [market: string]: SummarizedInterval; } -export interface SummarizedInterval { - 'period_start': number; - 'open': number; - 'close': number; - 'high': number; - 'low': number; - 'avg': number; - 'volume_right': number; - 'volume_left': number; -} diff --git a/backend/src/api/bisq/markets-api.ts b/backend/src/api/bisq/markets-api.ts deleted file mode 100644 index 1b5b93059..000000000 --- a/backend/src/api/bisq/markets-api.ts +++ /dev/null @@ -1,679 +0,0 @@ -import { Currencies, OffersData, TradesData, Depth, Currency, Interval, HighLowOpenClose, - Markets, Offers, Offer, BisqTrade, MarketVolume, Tickers, Ticker, SummarizedIntervals, SummarizedInterval } from './interfaces'; - -const strtotime = require('./strtotime'); - -class BisqMarketsApi { - private cryptoCurrencyData: Currency[] = []; - private fiatCurrencyData: Currency[] = []; - private activeCryptoCurrencyData: Currency[] = []; - private activeFiatCurrencyData: Currency[] = []; - private offersData: OffersData[] = []; - private tradesData: TradesData[] = []; - private fiatCurrenciesIndexed: { [code: string]: true } = {}; - private allCurrenciesIndexed: { [code: string]: Currency } = {}; - private tradeDataByMarket: { [market: string]: TradesData[] } = {}; - private tickersCache: Ticker | Tickers | null = null; - - constructor() { } - - setOffersData(offers: OffersData[]) { - this.offersData = offers; - } - - setTradesData(trades: TradesData[]) { - this.tradesData = trades; - this.tradeDataByMarket = {}; - - this.tradesData.forEach((trade) => { - trade._market = trade.currencyPair.toLowerCase().replace('/', '_'); - if (!this.tradeDataByMarket[trade._market]) { - this.tradeDataByMarket[trade._market] = []; - } - this.tradeDataByMarket[trade._market].push(trade); - }); - } - - setCurrencyData(cryptoCurrency: Currency[], fiatCurrency: Currency[], activeCryptoCurrency: Currency[], activeFiatCurrency: Currency[]) { - this.cryptoCurrencyData = cryptoCurrency, - this.fiatCurrencyData = fiatCurrency, - this.activeCryptoCurrencyData = activeCryptoCurrency, - this.activeFiatCurrencyData = activeFiatCurrency; - - this.fiatCurrenciesIndexed = {}; - this.allCurrenciesIndexed = {}; - - this.fiatCurrencyData.forEach((currency) => { - currency._type = 'fiat'; - this.fiatCurrenciesIndexed[currency.code] = true; - this.allCurrenciesIndexed[currency.code] = currency; - }); - this.cryptoCurrencyData.forEach((currency) => { - currency._type = 'crypto'; - this.allCurrenciesIndexed[currency.code] = currency; - }); - } - - updateCache() { - this.tickersCache = null; - this.tickersCache = this.getTicker(); - } - - getCurrencies( - type: 'crypto' | 'fiat' | 'active' | 'all' = 'all', - ): Currencies { - let currencies: Currency[]; - - switch (type) { - case 'fiat': - currencies = this.fiatCurrencyData; - break; - case 'crypto': - currencies = this.cryptoCurrencyData; - break; - case 'active': - currencies = this.activeCryptoCurrencyData.concat(this.activeFiatCurrencyData); - break; - case 'all': - default: - currencies = this.cryptoCurrencyData.concat(this.fiatCurrencyData); - } - const result = {}; - currencies.forEach((currency) => { - result[currency.code] = currency; - }); - return result; - } - - getDepth( - market: string, - ): Depth { - const currencyPair = market.replace('_', '/').toUpperCase(); - - const buys = this.offersData - .filter((offer) => offer.currencyPair === currencyPair && offer.primaryMarketDirection === 'BUY') - .map((offer) => offer.price) - .sort((a, b) => b - a) - .map((price) => this.intToBtc(price)); - - const sells = this.offersData - .filter((offer) => offer.currencyPair === currencyPair && offer.primaryMarketDirection === 'SELL') - .map((offer) => offer.price) - .sort((a, b) => a - b) - .map((price) => this.intToBtc(price)); - - const result = {}; - result[market] = { - 'buys': buys, - 'sells': sells, - }; - return result; - } - - getOffers( - market: string, - direction?: 'buy' | 'sell', - ): Offers { - const currencyPair = market.replace('_', '/').toUpperCase(); - - let buys: Offer[] | null = null; - let sells: Offer[] | null = null; - - if (!direction || direction === 'buy') { - buys = this.offersData - .filter((offer) => offer.currencyPair === currencyPair && offer.primaryMarketDirection === 'BUY') - .sort((a, b) => b.price - a.price) - .map((offer) => this.offerDataToOffer(offer, market)); - } - - if (!direction || direction === 'sell') { - sells = this.offersData - .filter((offer) => offer.currencyPair === currencyPair && offer.primaryMarketDirection === 'SELL') - .sort((a, b) => a.price - b.price) - .map((offer) => this.offerDataToOffer(offer, market)); - } - - const result: Offers = {}; - result[market] = { - 'buys': buys, - 'sells': sells, - }; - return result; - } - - getMarkets(): Markets { - const allCurrencies = this.getCurrencies(); - const activeCurrencies = this.getCurrencies('active'); - const markets = {}; - - for (const currency of Object.keys(activeCurrencies)) { - if (allCurrencies[currency].code === 'BTC') { - continue; - } - - const isFiat = allCurrencies[currency]._type === 'fiat'; - const pmarketname = allCurrencies['BTC']['name']; - - const lsymbol = isFiat ? 'BTC' : currency; - const rsymbol = isFiat ? currency : 'BTC'; - const lname = isFiat ? pmarketname : allCurrencies[currency].name; - const rname = isFiat ? allCurrencies[currency].name : pmarketname; - const ltype = isFiat ? 'crypto' : allCurrencies[currency]._type; - const rtype = isFiat ? 'fiat' : 'crypto'; - const lprecision = 8; - const rprecision = isFiat ? 2 : 8; - const pair = lsymbol.toLowerCase() + '_' + rsymbol.toLowerCase(); - - markets[pair] = { - 'pair': pair, - 'lname': lname, - 'rname': rname, - 'lsymbol': lsymbol, - 'rsymbol': rsymbol, - 'lprecision': lprecision, - 'rprecision': rprecision, - 'ltype': ltype, - 'rtype': rtype, - 'name': lname + '/' + rname, - }; - } - - return markets; - } - - getTrades( - market: string, - timestamp_from?: number, - timestamp_to?: number, - trade_id_from?: string, - trade_id_to?: string, - direction?: 'buy' | 'sell', - limit: number = 100, - sort: 'asc' | 'desc' = 'desc', - ): BisqTrade[] { - limit = Math.min(limit, 2000); - const _market = market === 'all' ? undefined : market; - - if (!timestamp_from) { - timestamp_from = new Date('2016-01-01').getTime() / 1000; - } - if (!timestamp_to) { - timestamp_to = new Date().getTime() / 1000; - } - - const matches = this.getTradesByCriteria(_market, timestamp_to, timestamp_from, - trade_id_to, trade_id_from, direction, sort, limit, false); - - if (sort === 'asc') { - matches.sort((a, b) => a.tradeDate - b.tradeDate); - } else { - matches.sort((a, b) => b.tradeDate - a.tradeDate); - } - - return matches.map((trade) => { - const bsqTrade: BisqTrade = { - direction: trade.primaryMarketDirection, - price: trade._tradePriceStr, - amount: trade._tradeAmountStr, - volume: trade._tradeVolumeStr, - payment_method: trade.paymentMethod, - trade_id: trade.offerId, - trade_date: trade.tradeDate, - }; - if (market === 'all') { - bsqTrade.market = trade._market; - } - return bsqTrade; - }); - } - - getVolumes( - market?: string, - timestamp_from?: number, - timestamp_to?: number, - interval: Interval = 'auto', - milliseconds?: boolean, - timestamp: 'no' | 'yes' = 'yes', - ): MarketVolume[] { - if (milliseconds) { - timestamp_from = timestamp_from ? timestamp_from / 1000 : timestamp_from; - timestamp_to = timestamp_to ? timestamp_to / 1000 : timestamp_to; - } - if (!timestamp_from) { - timestamp_from = new Date('2016-01-01').getTime() / 1000; - } - if (!timestamp_to) { - timestamp_to = new Date().getTime() / 1000; - } - - const trades = this.getTradesByCriteria(market, timestamp_to, timestamp_from, - undefined, undefined, undefined, 'asc', Number.MAX_SAFE_INTEGER); - - if (interval === 'auto') { - const range = timestamp_to - timestamp_from; - interval = this.getIntervalFromRange(range); - } - - const intervals: any = {}; - const marketVolumes: MarketVolume[] = []; - - for (const trade of trades) { - const traded_at = trade['tradeDate'] / 1000; - const interval_start = this.intervalStart(traded_at, interval); - - if (!intervals[interval_start]) { - intervals[interval_start] = { - 'volume': 0, - 'num_trades': 0, - }; - } - - const period = intervals[interval_start]; - period['period_start'] = interval_start; - period['volume'] += this.fiatCurrenciesIndexed[trade.currency] ? trade._tradeAmount : trade._tradeVolume; - period['num_trades']++; - } - - for (const p in intervals) { - if (intervals.hasOwnProperty(p)) { - const period = intervals[p]; - marketVolumes.push({ - period_start: timestamp === 'no' ? new Date(period['period_start'] * 1000).toISOString() : period['period_start'], - num_trades: period['num_trades'], - volume: this.intToBtc(period['volume']), - }); - } - } - - return marketVolumes; - } - - getTicker( - market?: string, - ): Tickers | Ticker | null { - if (market) { - return this.getTickerFromMarket(market); - } - - if (this.tickersCache) { - return this.tickersCache; - } - - const allMarkets = this.getMarkets(); - const tickers = {}; - for (const m in allMarkets) { - if (allMarkets.hasOwnProperty(m)) { - tickers[allMarkets[m].pair] = this.getTickerFromMarket(allMarkets[m].pair); - } - } - - return tickers; - } - - getTickerFromMarket(market: string): Ticker | null { - let ticker: Ticker; - const timestamp_from = strtotime('-24 hour'); - const timestamp_to = new Date().getTime() / 1000; - const trades = this.getTradesByCriteria(market, timestamp_to, timestamp_from, - undefined, undefined, undefined, 'asc', Number.MAX_SAFE_INTEGER); - - const periods: SummarizedInterval[] = Object.values(this.getTradesSummarized(trades, timestamp_from)); - - const allCurrencies = this.getCurrencies(); - const currencyRight = allCurrencies[market.split('_')[1].toUpperCase()]; - - if (periods[0]) { - ticker = { - 'last': this.intToBtc(periods[0].close), - 'high': this.intToBtc(periods[0].high), - 'low': this.intToBtc(periods[0].low), - 'volume_left': this.intToBtc(periods[0].volume_left), - 'volume_right': this.intToBtc(periods[0].volume_right), - 'buy': null, - 'sell': null, - }; - } else { - const lastTrade = this.tradeDataByMarket[market]; - if (!lastTrade) { - return null; - } - const tradePrice = lastTrade[0].primaryMarketTradePrice * Math.pow(10, 8 - currencyRight.precision); - - const lastTradePrice = this.intToBtc(tradePrice); - ticker = { - 'last': lastTradePrice, - 'high': lastTradePrice, - 'low': lastTradePrice, - 'volume_left': '0', - 'volume_right': '0', - 'buy': null, - 'sell': null, - }; - } - - const timestampFromMilli = timestamp_from * 1000; - const timestampToMilli = timestamp_to * 1000; - - const currencyPair = market.replace('_', '/').toUpperCase(); - const offersData = this.offersData.slice().sort((a, b) => a.price - b.price); - - const buy = offersData.find((offer) => offer.currencyPair === currencyPair - && offer.primaryMarketDirection === 'BUY' - && offer.date >= timestampFromMilli - && offer.date <= timestampToMilli - ); - const sell = offersData.find((offer) => offer.currencyPair === currencyPair - && offer.primaryMarketDirection === 'SELL' - && offer.date >= timestampFromMilli - && offer.date <= timestampToMilli - ); - - if (buy) { - ticker.buy = this.intToBtc(buy.primaryMarketPrice * Math.pow(10, 8 - currencyRight.precision)); - } - if (sell) { - ticker.sell = this.intToBtc(sell.primaryMarketPrice * Math.pow(10, 8 - currencyRight.precision)); - } - - return ticker; - } - - getHloc( - market: string, - interval: Interval = 'auto', - timestamp_from?: number, - timestamp_to?: number, - milliseconds?: boolean, - timestamp: 'no' | 'yes' = 'yes', - ): HighLowOpenClose[] { - if (milliseconds) { - timestamp_from = timestamp_from ? timestamp_from / 1000 : timestamp_from; - timestamp_to = timestamp_to ? timestamp_to / 1000 : timestamp_to; - } - if (!timestamp_from) { - timestamp_from = new Date('2016-01-01').getTime() / 1000; - } - if (!timestamp_to) { - timestamp_to = new Date().getTime() / 1000; - } - - const trades = this.getTradesByCriteria(market, timestamp_to, timestamp_from, - undefined, undefined, undefined, 'asc', Number.MAX_SAFE_INTEGER); - - if (interval === 'auto') { - const range = timestamp_to - timestamp_from; - interval = this.getIntervalFromRange(range); - } - - const intervals = this.getTradesSummarized(trades, timestamp_from, interval); - - const hloc: HighLowOpenClose[] = []; - - for (const p in intervals) { - if (intervals.hasOwnProperty(p)) { - const period = intervals[p]; - hloc.push({ - period_start: timestamp === 'no' ? new Date(period['period_start'] * 1000).toISOString() : period['period_start'], - open: this.intToBtc(period['open']), - close: this.intToBtc(period['close']), - high: this.intToBtc(period['high']), - low: this.intToBtc(period['low']), - avg: this.intToBtc(period['avg']), - volume_right: this.intToBtc(period['volume_right']), - volume_left: this.intToBtc(period['volume_left']), - }); - } - } - - return hloc; - } - - private getIntervalFromRange(range: number): Interval { - // two days range loads minute data - if (range <= 3600) { - // up to one hour range loads minutely data - return 'minute'; - } else if (range <= 1 * 24 * 3600) { - // up to one day range loads half-hourly data - return 'half_hour'; - } else if (range <= 3 * 24 * 3600) { - // up to 3 day range loads hourly data - return 'hour'; - } else if (range <= 7 * 24 * 3600) { - // up to 7 day range loads half-daily data - return 'half_day'; - } else if (range <= 60 * 24 * 3600) { - // up to 2 month range loads daily data - return 'day'; - } else if (range <= 12 * 31 * 24 * 3600) { - // up to one year range loads weekly data - return 'week'; - } else if (range <= 12 * 31 * 24 * 3600) { - // up to 5 year range loads monthly data - return 'month'; - } else { - // greater range loads yearly data - return 'year'; - } - } - - getVolumesByTime(time: number): MarketVolume[] { - const timestamp_from = new Date().getTime() / 1000 - time; - const timestamp_to = new Date().getTime() / 1000; - - const trades = this.getTradesByCriteria(undefined, timestamp_to, timestamp_from, - undefined, undefined, undefined, 'asc', Number.MAX_SAFE_INTEGER); - - const markets: any = {}; - - for (const trade of trades) { - if (!markets[trade._market]) { - markets[trade._market] = { - 'volume': 0, - 'num_trades': 0, - }; - } - - markets[trade._market]['volume'] += this.fiatCurrenciesIndexed[trade.currency] ? trade._tradeAmount : trade._tradeVolume; - markets[trade._market]['num_trades']++; - } - - return markets; - } - - private getTradesSummarized(trades: TradesData[], timestamp_from: number, interval?: string): SummarizedIntervals { - const intervals: any = {}; - const intervals_prices: any = {}; - - for (const trade of trades) { - const traded_at = trade.tradeDate / 1000; - const interval_start = !interval ? timestamp_from : this.intervalStart(traded_at, interval); - - if (!intervals[interval_start]) { - intervals[interval_start] = { - 'open': 0, - 'close': 0, - 'high': 0, - 'low': 0, - 'avg': 0, - 'volume_right': 0, - 'volume_left': 0, - }; - intervals_prices[interval_start] = []; - } - const period = intervals[interval_start]; - const price = trade._tradePrice; - - if (!intervals_prices[interval_start]['leftvol']) { - intervals_prices[interval_start]['leftvol'] = []; - } - if (!intervals_prices[interval_start]['rightvol']) { - intervals_prices[interval_start]['rightvol'] = []; - } - - intervals_prices[interval_start]['leftvol'].push(trade._tradeAmount); - intervals_prices[interval_start]['rightvol'].push(trade._tradeVolume); - - if (price) { - const plow = period['low']; - period['period_start'] = interval_start; - period['open'] = period['open'] || price; - period['close'] = price; - period['high'] = price > period['high'] ? price : period['high']; - period['low'] = (plow && price > plow) ? period['low'] : price; - period['avg'] = intervals_prices[interval_start]['rightvol'].reduce((p: number, c: number) => c + p, 0) - / intervals_prices[interval_start]['leftvol'].reduce((c: number, p: number) => c + p, 0) * 100000000; - period['volume_left'] += trade._tradeAmount; - period['volume_right'] += trade._tradeVolume; - } - } - return intervals; - } - - private getTradesByCriteria( - market: string | undefined, - timestamp_to: number, - timestamp_from: number, - trade_id_to: string | undefined, - trade_id_from: string | undefined, - direction: 'buy' | 'sell' | undefined, - sort: string, - limit: number, - integerAmounts: boolean = true, - ): TradesData[] { - let trade_id_from_ts: number | null = null; - let trade_id_to_ts: number | null = null; - const allCurrencies = this.getCurrencies(); - - const timestampFromMilli = timestamp_from * 1000; - const timestampToMilli = timestamp_to * 1000; - - // note: the offer_id_from/to depends on iterating over trades in - // descending chronological order. - const tradesDataSorted = this.tradesData.slice(); - if (sort === 'asc') { - tradesDataSorted.reverse(); - } - - let matches: TradesData[] = []; - for (const trade of tradesDataSorted) { - if (trade_id_from === trade.offerId) { - trade_id_from_ts = trade.tradeDate; - } - if (trade_id_to === trade.offerId) { - trade_id_to_ts = trade.tradeDate; - } - if (trade_id_to && trade_id_to_ts === null) { - continue; - } - if (trade_id_from && trade_id_from_ts != null && trade_id_from_ts !== trade.tradeDate) { - continue; - } - if (market && market !== trade._market) { - continue; - } - if (timestampFromMilli && timestampFromMilli > trade.tradeDate) { - continue; - } - if (timestampToMilli && timestampToMilli < trade.tradeDate) { - continue; - } - if (direction && direction !== trade.direction.toLowerCase()) { - continue; - } - - // Filter out bogus trades with BTC/BTC or XXX/XXX market. - // See github issue: https://github.com/bitsquare/bitsquare/issues/883 - const currencyPairs = trade.currencyPair.split('/'); - if (currencyPairs[0] === currencyPairs[1]) { - continue; - } - - const currencyLeft = allCurrencies[currencyPairs[0]]; - const currencyRight = allCurrencies[currencyPairs[1]]; - - if (!currencyLeft || !currencyRight) { - continue; - } - - const tradePrice = trade.primaryMarketTradePrice * Math.pow(10, 8 - currencyRight.precision); - const tradeAmount = trade.primaryMarketTradeAmount * Math.pow(10, 8 - currencyLeft.precision); - const tradeVolume = trade.primaryMarketTradeVolume * Math.pow(10, 8 - currencyRight.precision); - - if (integerAmounts) { - trade._tradePrice = tradePrice; - trade._tradeAmount = tradeAmount; - trade._tradeVolume = tradeVolume; - trade._offerAmount = trade.offerAmount; - } else { - trade._tradePriceStr = this.intToBtc(tradePrice); - trade._tradeAmountStr = this.intToBtc(tradeAmount); - trade._tradeVolumeStr = this.intToBtc(tradeVolume); - trade._offerAmountStr = this.intToBtc(trade.offerAmount); - } - - matches.push(trade); - - if (matches.length >= limit) { - break; - } - } - - if ((trade_id_from && !trade_id_from_ts) || (trade_id_to && !trade_id_to_ts)) { - matches = []; - } - return matches; - } - - private intervalStart(ts: number, interval: string): number { - switch (interval) { - case 'minute': - return (ts - (ts % 60)); - case '10_minute': - return (ts - (ts % 600)); - case 'half_hour': - return (ts - (ts % 1800)); - case 'hour': - return (ts - (ts % 3600)); - case 'half_day': - return (ts - (ts % (3600 * 12))); - case 'day': - return strtotime('midnight today', ts); - case 'week': - return strtotime('midnight sunday last week', ts); - case 'month': - return strtotime('midnight first day of this month', ts); - case 'year': - return strtotime('midnight first day of january', ts); - default: - throw new Error('Unsupported interval'); - } -} - - private offerDataToOffer(offer: OffersData, market: string): Offer { - const currencyPairs = market.split('_'); - const currencyRight = this.allCurrenciesIndexed[currencyPairs[1].toUpperCase()]; - const currencyLeft = this.allCurrenciesIndexed[currencyPairs[0].toUpperCase()]; - const price = offer['primaryMarketPrice'] * Math.pow( 10, 8 - currencyRight['precision']); - const amount = offer['primaryMarketAmount'] * Math.pow( 10, 8 - currencyLeft['precision']); - const volume = offer['primaryMarketVolume'] * Math.pow( 10, 8 - currencyRight['precision']); - - return { - offer_id: offer.id, - offer_date: offer.date, - direction: offer.primaryMarketDirection, - min_amount: this.intToBtc(offer.minAmount), - amount: this.intToBtc(amount), - price: this.intToBtc(price), - volume: this.intToBtc(volume), - payment_method: offer.paymentMethod, - offer_fee_txid: null, - }; - } - - private intToBtc(val: number): string { - return (val / 100000000).toFixed(8); - } -} - -export default new BisqMarketsApi(); diff --git a/backend/src/api/bisq/markets.ts b/backend/src/api/bisq/markets.ts deleted file mode 100644 index 08f40d772..000000000 --- a/backend/src/api/bisq/markets.ts +++ /dev/null @@ -1,137 +0,0 @@ -import config from '../../config'; -import * as fs from 'fs'; -import { OffersData as OffersData, TradesData, Currency } from './interfaces'; -import bisqMarket from './markets-api'; -import logger from '../../logger'; - -class Bisq { - private static FOLDER_WATCH_CHANGE_DETECTION_DEBOUNCE = 4000; - private static MARKET_JSON_PATH = config.BISQ.DATA_PATH; - private static MARKET_JSON_FILE_PATHS = { - activeCryptoCurrency: '/active_crypto_currency_list.json', - activeFiatCurrency: '/active_fiat_currency_list.json', - cryptoCurrency: '/crypto_currency_list.json', - fiatCurrency: '/fiat_currency_list.json', - offers: '/offers_statistics.json', - trades: '/trade_statistics.json', - }; - - private cryptoCurrencyLastMtime = new Date('2016-01-01'); - private fiatCurrencyLastMtime = new Date('2016-01-01'); - private offersLastMtime = new Date('2016-01-01'); - private tradesLastMtime = new Date('2016-01-01'); - - private subdirectoryWatcher: fs.FSWatcher | undefined; - - constructor() {} - - startBisqService(): void { - try { - this.checkForBisqDataFolder(); - } catch (e) { - logger.info('Retrying to start bisq service (markets) in 3 minutes'); - setTimeout(this.startBisqService.bind(this), 180000); - return; - } - this.loadBisqDumpFile(); - this.startBisqDirectoryWatcher(); - } - - private checkForBisqDataFolder() { - if (!fs.existsSync(Bisq.MARKET_JSON_PATH + Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency)) { - logger.err(Bisq.MARKET_JSON_PATH + Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency + ` doesn't exist. Make sure Bisq is running and the config is correct before starting the server.`); - throw new Error(`Cannot load BISQ ${Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency} file`); - } - } - - private startBisqDirectoryWatcher() { - if (this.subdirectoryWatcher) { - this.subdirectoryWatcher.close(); - } - if (!fs.existsSync(Bisq.MARKET_JSON_PATH + Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency)) { - logger.warn(Bisq.MARKET_JSON_PATH + Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency + ` doesn't exist. Trying to restart sub directory watcher again in 3 minutes.`); - setTimeout(() => this.startBisqDirectoryWatcher(), 180000); - return; - } - let fsWait: NodeJS.Timeout | null = null; - this.subdirectoryWatcher = fs.watch(Bisq.MARKET_JSON_PATH, () => { - if (fsWait) { - clearTimeout(fsWait); - } - fsWait = setTimeout(() => { - logger.debug(`Change detected in the Bisq market data folder.`); - this.loadBisqDumpFile(); - }, Bisq.FOLDER_WATCH_CHANGE_DETECTION_DEBOUNCE); - }); - } - - private async loadBisqDumpFile(): Promise { - const start = new Date().getTime(); - try { - let marketsDataUpdated = false; - const cryptoMtime = this.getFileMtime(Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency); - const fiatMtime = this.getFileMtime(Bisq.MARKET_JSON_FILE_PATHS.fiatCurrency); - if (cryptoMtime > this.cryptoCurrencyLastMtime || fiatMtime > this.fiatCurrencyLastMtime) { - const cryptoCurrencyData = await this.loadData(Bisq.MARKET_JSON_FILE_PATHS.cryptoCurrency); - const fiatCurrencyData = await this.loadData(Bisq.MARKET_JSON_FILE_PATHS.fiatCurrency); - const activeCryptoCurrencyData = await this.loadData(Bisq.MARKET_JSON_FILE_PATHS.activeCryptoCurrency); - const activeFiatCurrencyData = await this.loadData(Bisq.MARKET_JSON_FILE_PATHS.activeFiatCurrency); - logger.debug('Updating Bisq Market Currency Data'); - bisqMarket.setCurrencyData(cryptoCurrencyData, fiatCurrencyData, activeCryptoCurrencyData, activeFiatCurrencyData); - if (cryptoMtime > this.cryptoCurrencyLastMtime) { - this.cryptoCurrencyLastMtime = cryptoMtime; - } - if (fiatMtime > this.fiatCurrencyLastMtime) { - this.fiatCurrencyLastMtime = fiatMtime; - } - marketsDataUpdated = true; - } - const offersMtime = this.getFileMtime(Bisq.MARKET_JSON_FILE_PATHS.offers); - if (offersMtime > this.offersLastMtime) { - const offersData = await this.loadData(Bisq.MARKET_JSON_FILE_PATHS.offers); - logger.debug('Updating Bisq Market Offers Data'); - bisqMarket.setOffersData(offersData); - this.offersLastMtime = offersMtime; - marketsDataUpdated = true; - } - const tradesMtime = this.getFileMtime(Bisq.MARKET_JSON_FILE_PATHS.trades); - if (tradesMtime > this.tradesLastMtime) { - const tradesData = await this.loadData(Bisq.MARKET_JSON_FILE_PATHS.trades); - logger.debug('Updating Bisq Market Trades Data'); - bisqMarket.setTradesData(tradesData); - this.tradesLastMtime = tradesMtime; - marketsDataUpdated = true; - } - if (marketsDataUpdated) { - bisqMarket.updateCache(); - const time = new Date().getTime() - start; - logger.debug('Bisq market data updated in ' + time + ' ms'); - } - } catch (e) { - logger.err('loadBisqMarketDataDumpFile() error.' + (e instanceof Error ? e.message : e)); - } - } - - private getFileMtime(path: string): Date { - const stats = fs.statSync(Bisq.MARKET_JSON_PATH + path); - return stats.mtime; - } - - private loadData(path: string): Promise { - return new Promise((resolve, reject) => { - fs.readFile(Bisq.MARKET_JSON_PATH + path, 'utf8', (err, data) => { - if (err) { - reject(err); - } - try { - const parsedData = JSON.parse(data); - resolve(parsedData); - } catch (e) { - reject('JSON parse error (' + path + ')'); - } - }); - }); - } -} - -export default new Bisq(); diff --git a/backend/src/api/bisq/strtotime.ts b/backend/src/api/bisq/strtotime.ts deleted file mode 100644 index 912f00ec9..000000000 --- a/backend/src/api/bisq/strtotime.ts +++ /dev/null @@ -1,1375 +0,0 @@ -// @ts-nocheck - -/* -Copyright (c) 2007-2016 Kevin van Zonneveld (https://kvz.io) -and Contributors (https://locutus.io/authors) - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -/* - -https://github.com/locutusjs/locutus/blob/master/src/php/datetime/strtotime.js - -*/ - -const reSpace = '[ \\t]+' -const reSpaceOpt = '[ \\t]*' -const reMeridian = '(?:([ap])\\.?m\\.?([\\t ]|$))' -const reHour24 = '(2[0-4]|[01]?[0-9])' -const reHour24lz = '([01][0-9]|2[0-4])' -const reHour12 = '(0?[1-9]|1[0-2])' -const reMinute = '([0-5]?[0-9])' -const reMinutelz = '([0-5][0-9])' -const reSecond = '(60|[0-5]?[0-9])' -const reSecondlz = '(60|[0-5][0-9])' -const reFrac = '(?:\\.([0-9]+))' - -const reDayfull = 'sunday|monday|tuesday|wednesday|thursday|friday|saturday' -const reDayabbr = 'sun|mon|tue|wed|thu|fri|sat' -const reDaytext = reDayfull + '|' + reDayabbr + '|weekdays?' - -const reReltextnumber = 'first|second|third|fourth|fifth|sixth|seventh|eighth?|ninth|tenth|eleventh|twelfth' -const reReltexttext = 'next|last|previous|this' -const reReltextunit = '(?:second|sec|minute|min|hour|day|fortnight|forthnight|month|year)s?|weeks|' + reDaytext - -const reYear = '([0-9]{1,4})' -const reYear2 = '([0-9]{2})' -const reYear4 = '([0-9]{4})' -const reYear4withSign = '([+-]?[0-9]{4})' -const reMonth = '(1[0-2]|0?[0-9])' -const reMonthlz = '(0[0-9]|1[0-2])' -const reDay = '(?:(3[01]|[0-2]?[0-9])(?:st|nd|rd|th)?)' -const reDaylz = '(0[0-9]|[1-2][0-9]|3[01])' - -const reMonthFull = 'january|february|march|april|may|june|july|august|september|october|november|december' -const reMonthAbbr = 'jan|feb|mar|apr|may|jun|jul|aug|sept?|oct|nov|dec' -const reMonthroman = 'i[vx]|vi{0,3}|xi{0,2}|i{1,3}' -const reMonthText = '(' + reMonthFull + '|' + reMonthAbbr + '|' + reMonthroman + ')' - -const reTzCorrection = '((?:GMT)?([+-])' + reHour24 + ':?' + reMinute + '?)' -const reTzAbbr = '\\(?([a-zA-Z]{1,6})\\)?' -const reDayOfYear = '(00[1-9]|0[1-9][0-9]|[12][0-9][0-9]|3[0-5][0-9]|36[0-6])' -const reWeekOfYear = '(0[1-9]|[1-4][0-9]|5[0-3])' - -const reDateNoYear = reMonthText + '[ .\\t-]*' + reDay + '[,.stndrh\\t ]*' - -function processMeridian (hour, meridian) { - meridian = meridian && meridian.toLowerCase() - - switch (meridian) { - case 'a': - hour += hour === 12 ? -12 : 0 - break - case 'p': - hour += hour !== 12 ? 12 : 0 - break - } - - return hour -} - -function processYear (yearStr) { - let year = +yearStr - - if (yearStr.length < 4 && year < 100) { - year += year < 70 ? 2000 : 1900 - } - - return year -} - -function lookupMonth (monthStr) { - return { - jan: 0, - january: 0, - i: 0, - feb: 1, - february: 1, - ii: 1, - mar: 2, - march: 2, - iii: 2, - apr: 3, - april: 3, - iv: 3, - may: 4, - v: 4, - jun: 5, - june: 5, - vi: 5, - jul: 6, - july: 6, - vii: 6, - aug: 7, - august: 7, - viii: 7, - sep: 8, - sept: 8, - september: 8, - ix: 8, - oct: 9, - october: 9, - x: 9, - nov: 10, - november: 10, - xi: 10, - dec: 11, - december: 11, - xii: 11 - }[monthStr.toLowerCase()] -} - -function lookupWeekday (dayStr, desiredSundayNumber = 0) { - const dayNumbers = { - mon: 1, - monday: 1, - tue: 2, - tuesday: 2, - wed: 3, - wednesday: 3, - thu: 4, - thursday: 4, - fri: 5, - friday: 5, - sat: 6, - saturday: 6, - sun: 0, - sunday: 0 - } - - return dayNumbers[dayStr.toLowerCase()] || desiredSundayNumber -} - -function lookupRelative (relText) { - const relativeNumbers = { - last: -1, - previous: -1, - this: 0, - first: 1, - next: 1, - second: 2, - third: 3, - fourth: 4, - fifth: 5, - sixth: 6, - seventh: 7, - eight: 8, - eighth: 8, - ninth: 9, - tenth: 10, - eleventh: 11, - twelfth: 12 - } - - const relativeBehavior = { - this: 1 - } - - const relTextLower = relText.toLowerCase() - - return { - amount: relativeNumbers[relTextLower], - behavior: relativeBehavior[relTextLower] || 0 - } -} - -function processTzCorrection (tzOffset, oldValue) { - const reTzCorrectionLoose = /(?:GMT)?([+-])(\d+)(:?)(\d{0,2})/i - tzOffset = tzOffset && tzOffset.match(reTzCorrectionLoose) - - if (!tzOffset) { - return oldValue - } - - const sign = tzOffset[1] === '-' ? -1 : 1 - let hours = +tzOffset[2] - let minutes = +tzOffset[4] - - if (!tzOffset[4] && !tzOffset[3]) { - minutes = Math.floor(hours % 100) - hours = Math.floor(hours / 100) - } - - // timezone offset in seconds - return sign * (hours * 60 + minutes) * 60 -} - -// tz abbrevation : tz offset in seconds -const tzAbbrOffsets = { - acdt: 37800, - acst: 34200, - addt: -7200, - adt: -10800, - aedt: 39600, - aest: 36000, - ahdt: -32400, - ahst: -36000, - akdt: -28800, - akst: -32400, - amt: -13840, - apt: -10800, - ast: -14400, - awdt: 32400, - awst: 28800, - awt: -10800, - bdst: 7200, - bdt: -36000, - bmt: -14309, - bst: 3600, - cast: 34200, - cat: 7200, - cddt: -14400, - cdt: -18000, - cemt: 10800, - cest: 7200, - cet: 3600, - cmt: -15408, - cpt: -18000, - cst: -21600, - cwt: -18000, - chst: 36000, - dmt: -1521, - eat: 10800, - eddt: -10800, - edt: -14400, - eest: 10800, - eet: 7200, - emt: -26248, - ept: -14400, - est: -18000, - ewt: -14400, - ffmt: -14660, - fmt: -4056, - gdt: 39600, - gmt: 0, - gst: 36000, - hdt: -34200, - hkst: 32400, - hkt: 28800, - hmt: -19776, - hpt: -34200, - hst: -36000, - hwt: -34200, - iddt: 14400, - idt: 10800, - imt: 25025, - ist: 7200, - jdt: 36000, - jmt: 8440, - jst: 32400, - kdt: 36000, - kmt: 5736, - kst: 30600, - lst: 9394, - mddt: -18000, - mdst: 16279, - mdt: -21600, - mest: 7200, - met: 3600, - mmt: 9017, - mpt: -21600, - msd: 14400, - msk: 10800, - mst: -25200, - mwt: -21600, - nddt: -5400, - ndt: -9052, - npt: -9000, - nst: -12600, - nwt: -9000, - nzdt: 46800, - nzmt: 41400, - nzst: 43200, - pddt: -21600, - pdt: -25200, - pkst: 21600, - pkt: 18000, - plmt: 25590, - pmt: -13236, - ppmt: -17340, - ppt: -25200, - pst: -28800, - pwt: -25200, - qmt: -18840, - rmt: 5794, - sast: 7200, - sdmt: -16800, - sjmt: -20173, - smt: -13884, - sst: -39600, - tbmt: 10751, - tmt: 12344, - uct: 0, - utc: 0, - wast: 7200, - wat: 3600, - wemt: 7200, - west: 3600, - wet: 0, - wib: 25200, - wita: 28800, - wit: 32400, - wmt: 5040, - yddt: -25200, - ydt: -28800, - ypt: -28800, - yst: -32400, - ywt: -28800, - a: 3600, - b: 7200, - c: 10800, - d: 14400, - e: 18000, - f: 21600, - g: 25200, - h: 28800, - i: 32400, - k: 36000, - l: 39600, - m: 43200, - n: -3600, - o: -7200, - p: -10800, - q: -14400, - r: -18000, - s: -21600, - t: -25200, - u: -28800, - v: -32400, - w: -36000, - x: -39600, - y: -43200, - z: 0 -} - -const formats = { - yesterday: { - regex: /^yesterday/i, - name: 'yesterday', - callback () { - this.rd -= 1 - return this.resetTime() - } - }, - - now: { - regex: /^now/i, - name: 'now' - // do nothing - }, - - noon: { - regex: /^noon/i, - name: 'noon', - callback () { - return this.resetTime() && this.time(12, 0, 0, 0) - } - }, - - midnightOrToday: { - regex: /^(midnight|today)/i, - name: 'midnight | today', - callback () { - return this.resetTime() - } - }, - - tomorrow: { - regex: /^tomorrow/i, - name: 'tomorrow', - callback () { - this.rd += 1 - return this.resetTime() - } - }, - - timestamp: { - regex: /^@(-?\d+)/i, - name: 'timestamp', - callback (match, timestamp) { - this.rs += +timestamp - this.y = 1970 - this.m = 0 - this.d = 1 - this.dates = 0 - - return this.resetTime() && this.zone(0) - } - }, - - firstOrLastDay: { - regex: /^(first|last) day of/i, - name: 'firstdayof | lastdayof', - callback (match, day) { - if (day.toLowerCase() === 'first') { - this.firstOrLastDayOfMonth = 1 - } else { - this.firstOrLastDayOfMonth = -1 - } - } - }, - - backOrFrontOf: { - regex: RegExp('^(back|front) of ' + reHour24 + reSpaceOpt + reMeridian + '?', 'i'), - name: 'backof | frontof', - callback (match, side, hours, meridian) { - const back = side.toLowerCase() === 'back' - let hour = +hours - let minute = 15 - - if (!back) { - hour -= 1 - minute = 45 - } - - hour = processMeridian(hour, meridian) - - return this.resetTime() && this.time(hour, minute, 0, 0) - } - }, - - weekdayOf: { - regex: RegExp('^(' + reReltextnumber + '|' + reReltexttext + ')' + reSpace + '(' + reDayfull + '|' + reDayabbr + ')' + reSpace + 'of', 'i'), - name: 'weekdayof' - // todo - }, - - mssqltime: { - regex: RegExp('^' + reHour12 + ':' + reMinutelz + ':' + reSecondlz + '[:.]([0-9]+)' + reMeridian, 'i'), - name: 'mssqltime', - callback (match, hour, minute, second, frac, meridian) { - return this.time(processMeridian(+hour, meridian), +minute, +second, +frac.substr(0, 3)) - } - }, - - timeLong12: { - regex: RegExp('^' + reHour12 + '[:.]' + reMinute + '[:.]' + reSecondlz + reSpaceOpt + reMeridian, 'i'), - name: 'timelong12', - callback (match, hour, minute, second, meridian) { - return this.time(processMeridian(+hour, meridian), +minute, +second, 0) - } - }, - - timeShort12: { - regex: RegExp('^' + reHour12 + '[:.]' + reMinutelz + reSpaceOpt + reMeridian, 'i'), - name: 'timeshort12', - callback (match, hour, minute, meridian) { - return this.time(processMeridian(+hour, meridian), +minute, 0, 0) - } - }, - - timeTiny12: { - regex: RegExp('^' + reHour12 + reSpaceOpt + reMeridian, 'i'), - name: 'timetiny12', - callback (match, hour, meridian) { - return this.time(processMeridian(+hour, meridian), 0, 0, 0) - } - }, - - soap: { - regex: RegExp('^' + reYear4 + '-' + reMonthlz + '-' + reDaylz + 'T' + reHour24lz + ':' + reMinutelz + ':' + reSecondlz + reFrac + reTzCorrection + '?', 'i'), - name: 'soap', - callback (match, year, month, day, hour, minute, second, frac, tzCorrection) { - return this.ymd(+year, month - 1, +day) && - this.time(+hour, +minute, +second, +frac.substr(0, 3)) && - this.zone(processTzCorrection(tzCorrection)) - } - }, - - wddx: { - regex: RegExp('^' + reYear4 + '-' + reMonth + '-' + reDay + 'T' + reHour24 + ':' + reMinute + ':' + reSecond), - name: 'wddx', - callback (match, year, month, day, hour, minute, second) { - return this.ymd(+year, month - 1, +day) && this.time(+hour, +minute, +second, 0) - } - }, - - exif: { - regex: RegExp('^' + reYear4 + ':' + reMonthlz + ':' + reDaylz + ' ' + reHour24lz + ':' + reMinutelz + ':' + reSecondlz, 'i'), - name: 'exif', - callback (match, year, month, day, hour, minute, second) { - return this.ymd(+year, month - 1, +day) && this.time(+hour, +minute, +second, 0) - } - }, - - xmlRpc: { - regex: RegExp('^' + reYear4 + reMonthlz + reDaylz + 'T' + reHour24 + ':' + reMinutelz + ':' + reSecondlz), - name: 'xmlrpc', - callback (match, year, month, day, hour, minute, second) { - return this.ymd(+year, month - 1, +day) && this.time(+hour, +minute, +second, 0) - } - }, - - xmlRpcNoColon: { - regex: RegExp('^' + reYear4 + reMonthlz + reDaylz + '[Tt]' + reHour24 + reMinutelz + reSecondlz), - name: 'xmlrpcnocolon', - callback (match, year, month, day, hour, minute, second) { - return this.ymd(+year, month - 1, +day) && this.time(+hour, +minute, +second, 0) - } - }, - - clf: { - regex: RegExp('^' + reDay + '/(' + reMonthAbbr + ')/' + reYear4 + ':' + reHour24lz + ':' + reMinutelz + ':' + reSecondlz + reSpace + reTzCorrection, 'i'), - name: 'clf', - callback (match, day, month, year, hour, minute, second, tzCorrection) { - return this.ymd(+year, lookupMonth(month), +day) && - this.time(+hour, +minute, +second, 0) && - this.zone(processTzCorrection(tzCorrection)) - } - }, - - iso8601long: { - regex: RegExp('^t?' + reHour24 + '[:.]' + reMinute + '[:.]' + reSecond + reFrac, 'i'), - name: 'iso8601long', - callback (match, hour, minute, second, frac) { - return this.time(+hour, +minute, +second, +frac.substr(0, 3)) - } - }, - - dateTextual: { - regex: RegExp('^' + reMonthText + '[ .\\t-]*' + reDay + '[,.stndrh\\t ]+' + reYear, 'i'), - name: 'datetextual', - callback (match, month, day, year) { - return this.ymd(processYear(year), lookupMonth(month), +day) - } - }, - - pointedDate4: { - regex: RegExp('^' + reDay + '[.\\t-]' + reMonth + '[.-]' + reYear4), - name: 'pointeddate4', - callback (match, day, month, year) { - return this.ymd(+year, month - 1, +day) - } - }, - - pointedDate2: { - regex: RegExp('^' + reDay + '[.\\t]' + reMonth + '\\.' + reYear2), - name: 'pointeddate2', - callback (match, day, month, year) { - return this.ymd(processYear(year), month - 1, +day) - } - }, - - timeLong24: { - regex: RegExp('^t?' + reHour24 + '[:.]' + reMinute + '[:.]' + reSecond), - name: 'timelong24', - callback (match, hour, minute, second) { - return this.time(+hour, +minute, +second, 0) - } - }, - - dateNoColon: { - regex: RegExp('^' + reYear4 + reMonthlz + reDaylz), - name: 'datenocolon', - callback (match, year, month, day) { - return this.ymd(+year, month - 1, +day) - } - }, - - pgydotd: { - regex: RegExp('^' + reYear4 + '\\.?' + reDayOfYear), - name: 'pgydotd', - callback (match, year, day) { - return this.ymd(+year, 0, +day) - } - }, - - timeShort24: { - regex: RegExp('^t?' + reHour24 + '[:.]' + reMinute, 'i'), - name: 'timeshort24', - callback (match, hour, minute) { - return this.time(+hour, +minute, 0, 0) - } - }, - - iso8601noColon: { - regex: RegExp('^t?' + reHour24lz + reMinutelz + reSecondlz, 'i'), - name: 'iso8601nocolon', - callback (match, hour, minute, second) { - return this.time(+hour, +minute, +second, 0) - } - }, - - iso8601dateSlash: { - // eventhough the trailing slash is optional in PHP - // here it's mandatory and inputs without the slash - // are handled by dateslash - regex: RegExp('^' + reYear4 + '/' + reMonthlz + '/' + reDaylz + '/'), - name: 'iso8601dateslash', - callback (match, year, month, day) { - return this.ymd(+year, month - 1, +day) - } - }, - - dateSlash: { - regex: RegExp('^' + reYear4 + '/' + reMonth + '/' + reDay), - name: 'dateslash', - callback (match, year, month, day) { - return this.ymd(+year, month - 1, +day) - } - }, - - american: { - regex: RegExp('^' + reMonth + '/' + reDay + '/' + reYear), - name: 'american', - callback (match, month, day, year) { - return this.ymd(processYear(year), month - 1, +day) - } - }, - - americanShort: { - regex: RegExp('^' + reMonth + '/' + reDay), - name: 'americanshort', - callback (match, month, day) { - return this.ymd(this.y, month - 1, +day) - } - }, - - gnuDateShortOrIso8601date2: { - // iso8601date2 is complete subset of gnudateshort - regex: RegExp('^' + reYear + '-' + reMonth + '-' + reDay), - name: 'gnudateshort | iso8601date2', - callback (match, year, month, day) { - return this.ymd(processYear(year), month - 1, +day) - } - }, - - iso8601date4: { - regex: RegExp('^' + reYear4withSign + '-' + reMonthlz + '-' + reDaylz), - name: 'iso8601date4', - callback (match, year, month, day) { - return this.ymd(+year, month - 1, +day) - } - }, - - gnuNoColon: { - regex: RegExp('^t?' + reHour24lz + reMinutelz, 'i'), - name: 'gnunocolon', - callback (match, hour, minute) { - // this rule is a special case - // if time was already set once by any preceding rule, it sets the captured value as year - switch (this.times) { - case 0: - return this.time(+hour, +minute, 0, this.f) - case 1: - this.y = hour * 100 + +minute - this.times++ - - return true - default: - return false - } - } - }, - - gnuDateShorter: { - regex: RegExp('^' + reYear4 + '-' + reMonth), - name: 'gnudateshorter', - callback (match, year, month) { - return this.ymd(+year, month - 1, 1) - } - }, - - pgTextReverse: { - // note: allowed years are from 32-9999 - // years below 32 should be treated as days in datefull - regex: RegExp('^' + '(\\d{3,4}|[4-9]\\d|3[2-9])-(' + reMonthAbbr + ')-' + reDaylz, 'i'), - name: 'pgtextreverse', - callback (match, year, month, day) { - return this.ymd(processYear(year), lookupMonth(month), +day) - } - }, - - dateFull: { - regex: RegExp('^' + reDay + '[ \\t.-]*' + reMonthText + '[ \\t.-]*' + reYear, 'i'), - name: 'datefull', - callback (match, day, month, year) { - return this.ymd(processYear(year), lookupMonth(month), +day) - } - }, - - dateNoDay: { - regex: RegExp('^' + reMonthText + '[ .\\t-]*' + reYear4, 'i'), - name: 'datenoday', - callback (match, month, year) { - return this.ymd(+year, lookupMonth(month), 1) - } - }, - - dateNoDayRev: { - regex: RegExp('^' + reYear4 + '[ .\\t-]*' + reMonthText, 'i'), - name: 'datenodayrev', - callback (match, year, month) { - return this.ymd(+year, lookupMonth(month), 1) - } - }, - - pgTextShort: { - regex: RegExp('^(' + reMonthAbbr + ')-' + reDaylz + '-' + reYear, 'i'), - name: 'pgtextshort', - callback (match, month, day, year) { - return this.ymd(processYear(year), lookupMonth(month), +day) - } - }, - - dateNoYear: { - regex: RegExp('^' + reDateNoYear, 'i'), - name: 'datenoyear', - callback (match, month, day) { - return this.ymd(this.y, lookupMonth(month), +day) - } - }, - - dateNoYearRev: { - regex: RegExp('^' + reDay + '[ .\\t-]*' + reMonthText, 'i'), - name: 'datenoyearrev', - callback (match, day, month) { - return this.ymd(this.y, lookupMonth(month), +day) - } - }, - - isoWeekDay: { - regex: RegExp('^' + reYear4 + '-?W' + reWeekOfYear + '(?:-?([0-7]))?'), - name: 'isoweekday | isoweek', - callback (match, year, week, day) { - day = day ? +day : 1 - - if (!this.ymd(+year, 0, 1)) { - return false - } - - // get day of week for Jan 1st - let dayOfWeek = new Date(this.y, this.m, this.d).getDay() - - // and use the day to figure out the offset for day 1 of week 1 - dayOfWeek = 0 - (dayOfWeek > 4 ? dayOfWeek - 7 : dayOfWeek) - - this.rd += dayOfWeek + ((week - 1) * 7) + day - } - }, - - relativeText: { - regex: RegExp('^(' + reReltextnumber + '|' + reReltexttext + ')' + reSpace + '(' + reReltextunit + ')', 'i'), - name: 'relativetext', - callback (match, relValue, relUnit) { - // todo: implement handling of 'this time-unit' - // eslint-disable-next-line no-unused-vars - const { amount, behavior } = lookupRelative(relValue) - - switch (relUnit.toLowerCase()) { - case 'sec': - case 'secs': - case 'second': - case 'seconds': - this.rs += amount - break - case 'min': - case 'mins': - case 'minute': - case 'minutes': - this.ri += amount - break - case 'hour': - case 'hours': - this.rh += amount - break - case 'day': - case 'days': - this.rd += amount - break - case 'fortnight': - case 'fortnights': - case 'forthnight': - case 'forthnights': - this.rd += amount * 14 - break - case 'week': - case 'weeks': - this.rd += amount * 7 - break - case 'month': - case 'months': - this.rm += amount - break - case 'year': - case 'years': - this.ry += amount - break - case 'mon': case 'monday': - case 'tue': case 'tuesday': - case 'wed': case 'wednesday': - case 'thu': case 'thursday': - case 'fri': case 'friday': - case 'sat': case 'saturday': - case 'sun': case 'sunday': - this.resetTime() - this.weekday = lookupWeekday(relUnit, 7) - this.weekdayBehavior = 1 - this.rd += (amount > 0 ? amount - 1 : amount) * 7 - break - case 'weekday': - case 'weekdays': - // todo - break - } - } - }, - - relative: { - regex: RegExp('^([+-]*)[ \\t]*(\\d+)' + reSpaceOpt + '(' + reReltextunit + '|week)', 'i'), - name: 'relative', - callback (match, signs, relValue, relUnit) { - const minuses = signs.replace(/[^-]/g, '').length - - const amount = +relValue * Math.pow(-1, minuses) - - switch (relUnit.toLowerCase()) { - case 'sec': - case 'secs': - case 'second': - case 'seconds': - this.rs += amount - break - case 'min': - case 'mins': - case 'minute': - case 'minutes': - this.ri += amount - break - case 'hour': - case 'hours': - this.rh += amount - break - case 'day': - case 'days': - this.rd += amount - break - case 'fortnight': - case 'fortnights': - case 'forthnight': - case 'forthnights': - this.rd += amount * 14 - break - case 'week': - case 'weeks': - this.rd += amount * 7 - break - case 'month': - case 'months': - this.rm += amount - break - case 'year': - case 'years': - this.ry += amount - break - case 'mon': case 'monday': - case 'tue': case 'tuesday': - case 'wed': case 'wednesday': - case 'thu': case 'thursday': - case 'fri': case 'friday': - case 'sat': case 'saturday': - case 'sun': case 'sunday': - this.resetTime() - this.weekday = lookupWeekday(relUnit, 7) - this.weekdayBehavior = 1 - this.rd += (amount > 0 ? amount - 1 : amount) * 7 - break - case 'weekday': - case 'weekdays': - // todo - break - } - } - }, - - dayText: { - regex: RegExp('^(' + reDaytext + ')', 'i'), - name: 'daytext', - callback (match, dayText) { - this.resetTime() - this.weekday = lookupWeekday(dayText, 0) - - if (this.weekdayBehavior !== 2) { - this.weekdayBehavior = 1 - } - } - }, - - relativeTextWeek: { - regex: RegExp('^(' + reReltexttext + ')' + reSpace + 'week', 'i'), - name: 'relativetextweek', - callback (match, relText) { - this.weekdayBehavior = 2 - - switch (relText.toLowerCase()) { - case 'this': - this.rd += 0 - break - case 'next': - this.rd += 7 - break - case 'last': - case 'previous': - this.rd -= 7 - break - } - - if (isNaN(this.weekday)) { - this.weekday = 1 - } - } - }, - - monthFullOrMonthAbbr: { - regex: RegExp('^(' + reMonthFull + '|' + reMonthAbbr + ')', 'i'), - name: 'monthfull | monthabbr', - callback (match, month) { - return this.ymd(this.y, lookupMonth(month), this.d) - } - }, - - tzCorrection: { - regex: RegExp('^' + reTzCorrection, 'i'), - name: 'tzcorrection', - callback (tzCorrection) { - return this.zone(processTzCorrection(tzCorrection)) - } - }, - - tzAbbr: { - regex: RegExp('^' + reTzAbbr), - name: 'tzabbr', - callback (match, abbr) { - const offset = tzAbbrOffsets[abbr.toLowerCase()] - - if (isNaN(offset)) { - return false - } - - return this.zone(offset) - } - }, - - ago: { - regex: /^ago/i, - name: 'ago', - callback () { - this.ry = -this.ry - this.rm = -this.rm - this.rd = -this.rd - this.rh = -this.rh - this.ri = -this.ri - this.rs = -this.rs - this.rf = -this.rf - } - }, - - year4: { - regex: RegExp('^' + reYear4), - name: 'year4', - callback (match, year) { - this.y = +year - return true - } - }, - - whitespace: { - regex: /^[ .,\t]+/, - name: 'whitespace' - // do nothing - }, - - dateShortWithTimeLong: { - regex: RegExp('^' + reDateNoYear + 't?' + reHour24 + '[:.]' + reMinute + '[:.]' + reSecond, 'i'), - name: 'dateshortwithtimelong', - callback (match, month, day, hour, minute, second) { - return this.ymd(this.y, lookupMonth(month), +day) && this.time(+hour, +minute, +second, 0) - } - }, - - dateShortWithTimeLong12: { - regex: RegExp('^' + reDateNoYear + reHour12 + '[:.]' + reMinute + '[:.]' + reSecondlz + reSpaceOpt + reMeridian, 'i'), - name: 'dateshortwithtimelong12', - callback (match, month, day, hour, minute, second, meridian) { - return this.ymd(this.y, lookupMonth(month), +day) && this.time(processMeridian(+hour, meridian), +minute, +second, 0) - } - }, - - dateShortWithTimeShort: { - regex: RegExp('^' + reDateNoYear + 't?' + reHour24 + '[:.]' + reMinute, 'i'), - name: 'dateshortwithtimeshort', - callback (match, month, day, hour, minute) { - return this.ymd(this.y, lookupMonth(month), +day) && this.time(+hour, +minute, 0, 0) - } - }, - - dateShortWithTimeShort12: { - regex: RegExp('^' + reDateNoYear + reHour12 + '[:.]' + reMinutelz + reSpaceOpt + reMeridian, 'i'), - name: 'dateshortwithtimeshort12', - callback (match, month, day, hour, minute, meridian) { - return this.ymd(this.y, lookupMonth(month), +day) && this.time(processMeridian(+hour, meridian), +minute, 0, 0) - } - } -} - -const resultProto = { - // date - y: NaN, - m: NaN, - d: NaN, - // time - h: NaN, - i: NaN, - s: NaN, - f: NaN, - - // relative shifts - ry: 0, - rm: 0, - rd: 0, - rh: 0, - ri: 0, - rs: 0, - rf: 0, - - // weekday related shifts - weekday: NaN, - weekdayBehavior: 0, - - // first or last day of month - // 0 none, 1 first, -1 last - firstOrLastDayOfMonth: 0, - - // timezone correction in minutes - z: NaN, - - // counters - dates: 0, - times: 0, - zones: 0, - - // helper functions - ymd (y, m, d) { - if (this.dates > 0) { - return false - } - - this.dates++ - this.y = y - this.m = m - this.d = d - return true - }, - - time (h, i, s, f) { - if (this.times > 0) { - return false - } - - this.times++ - this.h = h - this.i = i - this.s = s - this.f = f - - return true - }, - - resetTime () { - this.h = 0 - this.i = 0 - this.s = 0 - this.f = 0 - this.times = 0 - - return true - }, - - zone (minutes) { - if (this.zones <= 1) { - this.zones++ - this.z = minutes - return true - } - - return false - }, - - toDate (relativeTo) { - if (this.dates && !this.times) { - this.h = this.i = this.s = this.f = 0 - } - - // fill holes - if (isNaN(this.y)) { - this.y = relativeTo.getFullYear() - } - - if (isNaN(this.m)) { - this.m = relativeTo.getMonth() - } - - if (isNaN(this.d)) { - this.d = relativeTo.getDate() - } - - if (isNaN(this.h)) { - this.h = relativeTo.getHours() - } - - if (isNaN(this.i)) { - this.i = relativeTo.getMinutes() - } - - if (isNaN(this.s)) { - this.s = relativeTo.getSeconds() - } - - if (isNaN(this.f)) { - this.f = relativeTo.getMilliseconds() - } - - // adjust special early - switch (this.firstOrLastDayOfMonth) { - case 1: - this.d = 1 - break - case -1: - this.d = 0 - this.m += 1 - break - } - - if (!isNaN(this.weekday)) { - const date = new Date(relativeTo.getTime()) - date.setFullYear(this.y, this.m, this.d) - date.setHours(this.h, this.i, this.s, this.f) - - const dow = date.getDay() - - if (this.weekdayBehavior === 2) { - // To make "this week" work, where the current day of week is a "sunday" - if (dow === 0 && this.weekday !== 0) { - this.weekday = -6 - } - - // To make "sunday this week" work, where the current day of week is not a "sunday" - if (this.weekday === 0 && dow !== 0) { - this.weekday = 7 - } - - this.d -= dow - this.d += this.weekday - } else { - let diff = this.weekday - dow - - // some PHP magic - if ((this.rd < 0 && diff < 0) || (this.rd >= 0 && diff <= -this.weekdayBehavior)) { - diff += 7 - } - - if (this.weekday >= 0) { - this.d += diff - } else { - this.d -= (7 - (Math.abs(this.weekday) - dow)) - } - - this.weekday = NaN - } - } - - // adjust relative - this.y += this.ry - this.m += this.rm - this.d += this.rd - - this.h += this.rh - this.i += this.ri - this.s += this.rs - this.f += this.rf - - this.ry = this.rm = this.rd = 0 - this.rh = this.ri = this.rs = this.rf = 0 - - const result = new Date(relativeTo.getTime()) - // since Date constructor treats years <= 99 as 1900+ - // it can't be used, thus this weird way - result.setFullYear(this.y, this.m, this.d) - result.setHours(this.h, this.i, this.s, this.f) - - // note: this is done twice in PHP - // early when processing special relatives - // and late - // todo: check if the logic can be reduced - // to just one time action - switch (this.firstOrLastDayOfMonth) { - case 1: - result.setDate(1) - break - case -1: - result.setMonth(result.getMonth() + 1, 0) - break - } - - // adjust timezone - if (!isNaN(this.z) && result.getTimezoneOffset() !== this.z) { - result.setUTCFullYear( - result.getFullYear(), - result.getMonth(), - result.getDate()) - - result.setUTCHours( - result.getHours(), - result.getMinutes(), - result.getSeconds() - this.z, - result.getMilliseconds()) - } - - return result - } -} - -module.exports = function strtotime (str, now) { - // discuss at: https://locutus.io/php/strtotime/ - // original by: Caio Ariede (https://caioariede.com) - // improved by: Kevin van Zonneveld (https://kvz.io) - // improved by: Caio Ariede (https://caioariede.com) - // improved by: A. Matías Quezada (https://amatiasq.com) - // improved by: preuter - // improved by: Brett Zamir (https://brett-zamir.me) - // improved by: Mirko Faber - // input by: David - // bugfixed by: Wagner B. Soares - // bugfixed by: Artur Tchernychev - // bugfixed by: Stephan Bösch-Plepelits (https://github.com/plepe) - // reimplemented by: Rafał Kukawski - // note 1: Examples all have a fixed timestamp to prevent - // note 1: tests to fail because of variable time(zones) - // example 1: strtotime('+1 day', 1129633200) - // returns 1: 1129719600 - // example 2: strtotime('+1 week 2 days 4 hours 2 seconds', 1129633200) - // returns 2: 1130425202 - // example 3: strtotime('last month', 1129633200) - // returns 3: 1127041200 - // example 4: strtotime('2009-05-04 08:30:00+00') - // returns 4: 1241425800 - // example 5: strtotime('2009-05-04 08:30:00+02:00') - // returns 5: 1241418600 - // example 6: strtotime('2009-05-04 08:30:00 YWT') - // returns 6: 1241454600 - - if (now == null) { - now = Math.floor(Date.now() / 1000) - } - - // the rule order is important - // if multiple rules match, the longest match wins - // if multiple rules match the same string, the first match wins - const rules = [ - formats.yesterday, - formats.now, - formats.noon, - formats.midnightOrToday, - formats.tomorrow, - formats.timestamp, - formats.firstOrLastDay, - formats.backOrFrontOf, - // formats.weekdayOf, // not yet implemented - formats.timeTiny12, - formats.timeShort12, - formats.timeLong12, - formats.mssqltime, - formats.timeShort24, - formats.timeLong24, - formats.iso8601long, - formats.gnuNoColon, - formats.iso8601noColon, - formats.americanShort, - formats.american, - formats.iso8601date4, - formats.iso8601dateSlash, - formats.dateSlash, - formats.gnuDateShortOrIso8601date2, - formats.gnuDateShorter, - formats.dateFull, - formats.pointedDate4, - formats.pointedDate2, - formats.dateNoDay, - formats.dateNoDayRev, - formats.dateTextual, - formats.dateNoYear, - formats.dateNoYearRev, - formats.dateNoColon, - formats.xmlRpc, - formats.xmlRpcNoColon, - formats.soap, - formats.wddx, - formats.exif, - formats.pgydotd, - formats.isoWeekDay, - formats.pgTextShort, - formats.pgTextReverse, - formats.clf, - formats.year4, - formats.ago, - formats.dayText, - formats.relativeTextWeek, - formats.relativeText, - formats.monthFullOrMonthAbbr, - formats.tzCorrection, - formats.tzAbbr, - formats.dateShortWithTimeShort12, - formats.dateShortWithTimeLong12, - formats.dateShortWithTimeShort, - formats.dateShortWithTimeLong, - formats.relative, - formats.whitespace - ] - - const result = Object.create(resultProto) - - while (str.length) { - let longestMatch = null - let finalRule = null - - for (let i = 0, l = rules.length; i < l; i++) { - const format = rules[i] - - const match = str.match(format.regex) - - if (match) { - if (!longestMatch || match[0].length > longestMatch[0].length) { - longestMatch = match - finalRule = format - } - } - } - - if (!finalRule || (finalRule.callback && finalRule.callback.apply(result, longestMatch) === false)) { - return false - } - - str = str.substr(longestMatch[0].length) - finalRule = null - longestMatch = null - } - - return Math.floor(result.toDate(new Date(now * 1000)) / 1000) -} \ No newline at end of file diff --git a/backend/src/api/bitcoin/bitcoin.routes.ts b/backend/src/api/bitcoin/bitcoin.routes.ts index 93b614006..409e70589 100644 --- a/backend/src/api/bitcoin/bitcoin.routes.ts +++ b/backend/src/api/bitcoin/bitcoin.routes.ts @@ -417,7 +417,7 @@ class BitcoinRoutes { const height = req.params.height === undefined ? undefined : parseInt(req.params.height, 10); res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString()); res.json(await blocks.$getBlocks(height, 15)); - } else { // Liquid, Bisq + } else { // Liquid return await this.getLegacyBlocks(req, res); } } catch (e) { @@ -427,7 +427,7 @@ class BitcoinRoutes { private async getBlocksByBulk(req: Request, res: Response) { try { - if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) { // Liquid, Bisq - Not implemented + if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) { // Liquid - Not implemented return res.status(404).send(`This API is only available for Bitcoin networks`); } if (config.MEMPOOL.MAX_BLOCKS_BULK_QUERY <= 0) { diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index 2884f72eb..dda77daaa 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -312,14 +312,6 @@ class WebsocketHandler { client['track-donation'] = parsedMessage['track-donation']; } - if (parsedMessage['track-bisq-market']) { - if (/^[a-z]{3}_[a-z]{3}$/.test(parsedMessage['track-bisq-market'])) { - client['track-bisq-market'] = parsedMessage['track-bisq-market']; - } else { - client['track-bisq-market'] = null; - } - } - if (Object.keys(response).length) { client.send(this.serializeResponse(response)); } diff --git a/backend/src/config.ts b/backend/src/config.ts index ee3645e58..0c66e60f7 100644 --- a/backend/src/config.ts +++ b/backend/src/config.ts @@ -117,10 +117,6 @@ interface IConfig { ENABLED: boolean; TX_PER_SECOND_SAMPLE_PERIOD: number; }; - BISQ: { - ENABLED: boolean; - DATA_PATH: string; - }; SOCKS5PROXY: { ENABLED: boolean; USE_ONION: boolean; @@ -134,8 +130,6 @@ interface IConfig { MEMPOOL_ONION: string; LIQUID_API: string; LIQUID_ONION: string; - BISQ_URL: string; - BISQ_ONION: string; }; MAXMIND: { ENABLED: boolean; @@ -260,10 +254,6 @@ const defaults: IConfig = { 'ENABLED': true, 'TX_PER_SECOND_SAMPLE_PERIOD': 150 }, - 'BISQ': { - 'ENABLED': false, - 'DATA_PATH': '/bisq/statsnode-data/btc_mainnet/db' - }, 'LIGHTNING': { 'ENABLED': false, 'BACKEND': 'lnd', @@ -295,9 +285,7 @@ const defaults: IConfig = { 'MEMPOOL_API': 'https://mempool.space/api/v1', 'MEMPOOL_ONION': 'http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1', 'LIQUID_API': 'https://liquid.network/api/v1', - 'LIQUID_ONION': 'http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1', - 'BISQ_URL': 'https://bisq.markets/api', - 'BISQ_ONION': 'http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api' + 'LIQUID_ONION': 'http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1' }, 'MAXMIND': { 'ENABLED': false, @@ -335,7 +323,6 @@ class Config implements IConfig { DATABASE: IConfig['DATABASE']; SYSLOG: IConfig['SYSLOG']; STATISTICS: IConfig['STATISTICS']; - BISQ: IConfig['BISQ']; LIGHTNING: IConfig['LIGHTNING']; LND: IConfig['LND']; CLIGHTNING: IConfig['CLIGHTNING']; @@ -357,7 +344,6 @@ class Config implements IConfig { this.DATABASE = configs.DATABASE; this.SYSLOG = configs.SYSLOG; this.STATISTICS = configs.STATISTICS; - this.BISQ = configs.BISQ; this.LIGHTNING = configs.LIGHTNING; this.LND = configs.LND; this.CLIGHTNING = configs.CLIGHTNING; diff --git a/backend/src/index.ts b/backend/src/index.ts index 1988c7c56..c42dc49ef 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -11,8 +11,6 @@ import memPool from './api/mempool'; import diskCache from './api/disk-cache'; import statistics from './api/statistics/statistics'; import websocketHandler from './api/websocket-handler'; -import bisq from './api/bisq/bisq'; -import bisqMarkets from './api/bisq/markets'; import logger from './logger'; import backendInfo from './api/backend-info'; import loadingIndicators from './api/loading-indicators'; @@ -32,7 +30,6 @@ import networkSyncService from './tasks/lightning/network-sync.service'; import statisticsRoutes from './api/statistics/statistics.routes'; import pricesRoutes from './api/prices/prices.routes'; import miningRoutes from './api/mining/mining-routes'; -import bisqRoutes from './api/bisq/bisq.routes'; import liquidRoutes from './api/liquid/liquid.routes'; import bitcoinRoutes from './api/bitcoin/bitcoin.routes'; import fundingTxFetcher from './tasks/lightning/sync-tasks/funding-tx-fetcher'; @@ -181,13 +178,6 @@ class Server { setInterval(() => { this.healthCheck(); }, 2500); - if (config.BISQ.ENABLED) { - bisq.startBisqService(); - bisq.setPriceCallbackFunction((price) => websocketHandler.setExtraInitData('bsq-price', price)); - blocks.setNewBlockCallback(bisq.handleNewBitcoinBlock.bind(bisq)); - bisqMarkets.startBisqService(); - } - if (config.LIGHTNING.ENABLED) { this.$runLightningBackend(); } @@ -304,9 +294,6 @@ class Server { if (Common.indexingEnabled() && config.MEMPOOL.ENABLED) { miningRoutes.initRoutes(this.app); } - if (config.BISQ.ENABLED) { - bisqRoutes.initRoutes(this.app); - } if (Common.isLiquid()) { liquidRoutes.initRoutes(this.app); } diff --git a/backend/src/logger.ts b/backend/src/logger.ts index bbd781df6..bce77c63f 100644 --- a/backend/src/logger.ts +++ b/backend/src/logger.ts @@ -86,9 +86,6 @@ class Logger { if (config.LIGHTNING.ENABLED) { return config.MEMPOOL.NETWORK === 'mainnet' ? 'lightning' : `${config.MEMPOOL.NETWORK}-lightning`; } - if (config.BISQ.ENABLED) { - return 'bisq'; - } if (config.MEMPOOL.NETWORK && config.MEMPOOL.NETWORK !== 'mainnet') { return config.MEMPOOL.NETWORK; } diff --git a/backend/src/mempool.interfaces.ts b/backend/src/mempool.interfaces.ts index d04858607..a1e14dd51 100644 --- a/backend/src/mempool.interfaces.ts +++ b/backend/src/mempool.interfaces.ts @@ -407,7 +407,6 @@ export interface WebsocketResponse { 'track-tx': string; 'track-address': string; 'watch-mempool': boolean; - 'track-bisq-market': string; } export interface VbytesPerSecond { diff --git a/docker/README.md b/docker/README.md index 444324af8..f1539ba29 100644 --- a/docker/README.md +++ b/docker/README.md @@ -329,25 +329,6 @@ Corresponding `docker-compose.yml` overrides:
-`mempool-config.json`: -```json - "BISQ": { - "ENABLED": false, - "DATA_PATH": "/bisq/statsnode-data/btc_mainnet/db" - } -``` - -Corresponding `docker-compose.yml` overrides: -```yaml - api: - environment: - BISQ_ENABLED: "" - BISQ_DATA_PATH: "" - ... -``` - -
- `mempool-config.json`: ```json "SOCKS5PROXY": { diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json index f8935706c..dd232ba31 100644 --- a/docker/backend/mempool-config.json +++ b/docker/backend/mempool-config.json @@ -94,10 +94,6 @@ "ENABLED": __STATISTICS_ENABLED__, "TX_PER_SECOND_SAMPLE_PERIOD": __STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__ }, - "BISQ": { - "ENABLED": __BISQ_ENABLED__, - "DATA_PATH": "__BISQ_DATA_PATH__" - }, "LIGHTNING": { "ENABLED": __LIGHTNING_ENABLED__, "BACKEND": "__LIGHTNING_BACKEND__", @@ -129,9 +125,7 @@ "MEMPOOL_API": "__EXTERNAL_DATA_SERVER_MEMPOOL_API__", "MEMPOOL_ONION": "__EXTERNAL_DATA_SERVER_MEMPOOL_ONION__", "LIQUID_API": "__EXTERNAL_DATA_SERVER_LIQUID_API__", - "LIQUID_ONION": "__EXTERNAL_DATA_SERVER_LIQUID_ONION__", - "BISQ_URL": "__EXTERNAL_DATA_SERVER_BISQ_URL__", - "BISQ_ONION": "__EXTERNAL_DATA_SERVER_BISQ_ONION__" + "LIQUID_ONION": "__EXTERNAL_DATA_SERVER_LIQUID_ONION__" }, "MAXMIND": { "ENABLED": __MAXMIND_ENABLED__, diff --git a/docker/backend/start.sh b/docker/backend/start.sh index 50ecc17ab..18a9aec36 100755 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -95,10 +95,6 @@ __SYSLOG_FACILITY__=${SYSLOG_FACILITY:=local7} __STATISTICS_ENABLED__=${STATISTICS_ENABLED:=true} __STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__=${STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD:=150} -# BISQ -__BISQ_ENABLED__=${BISQ_ENABLED:=false} -__BISQ_DATA_PATH__=${BISQ_DATA_PATH:=/bisq/statsnode-data/btc_mainnet/db} - # SOCKS5PROXY __SOCKS5PROXY_ENABLED__=${SOCKS5PROXY_ENABLED:=false} __SOCKS5PROXY_USE_ONION__=${SOCKS5PROXY_USE_ONION:=true} @@ -112,8 +108,6 @@ __EXTERNAL_DATA_SERVER_MEMPOOL_API__=${EXTERNAL_DATA_SERVER_MEMPOOL_API:=https:/ __EXTERNAL_DATA_SERVER_MEMPOOL_ONION__=${EXTERNAL_DATA_SERVER_MEMPOOL_ONION:=http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1} __EXTERNAL_DATA_SERVER_LIQUID_API__=${EXTERNAL_DATA_SERVER_LIQUID_API:=https://liquid.network/api/v1} __EXTERNAL_DATA_SERVER_LIQUID_ONION__=${EXTERNAL_DATA_SERVER_LIQUID_ONION:=http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1} -__EXTERNAL_DATA_SERVER_BISQ_URL__=${EXTERNAL_DATA_SERVER_BISQ_URL:=https://bisq.markets/api} -__EXTERNAL_DATA_SERVER_BISQ_ONION__=${EXTERNAL_DATA_SERVER_BISQ_ONION:=http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api} # LIGHTNING __LIGHTNING_ENABLED__=${LIGHTNING_ENABLED:=false} @@ -248,9 +242,6 @@ sed -i "s!__SYSLOG_FACILITY__!${__SYSLOG_FACILITY__}!g" mempool-config.json sed -i "s!__STATISTICS_ENABLED__!${__STATISTICS_ENABLED__}!g" mempool-config.json sed -i "s!__STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__!${__STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__}!g" mempool-config.json -sed -i "s!__BISQ_ENABLED__!${__BISQ_ENABLED__}!g" mempool-config.json -sed -i "s!__BISQ_DATA_PATH__!${__BISQ_DATA_PATH__}!g" mempool-config.json - sed -i "s!__SOCKS5PROXY_ENABLED__!${__SOCKS5PROXY_ENABLED__}!g" mempool-config.json sed -i "s!__SOCKS5PROXY_USE_ONION__!${__SOCKS5PROXY_USE_ONION__}!g" mempool-config.json sed -i "s!__SOCKS5PROXY_HOST__!${__SOCKS5PROXY_HOST__}!g" mempool-config.json @@ -262,8 +253,6 @@ sed -i "s!__EXTERNAL_DATA_SERVER_MEMPOOL_API__!${__EXTERNAL_DATA_SERVER_MEMPOOL_ sed -i "s!__EXTERNAL_DATA_SERVER_MEMPOOL_ONION__!${__EXTERNAL_DATA_SERVER_MEMPOOL_ONION__}!g" mempool-config.json sed -i "s!__EXTERNAL_DATA_SERVER_LIQUID_API__!${__EXTERNAL_DATA_SERVER_LIQUID_API__}!g" mempool-config.json sed -i "s!__EXTERNAL_DATA_SERVER_LIQUID_ONION__!${__EXTERNAL_DATA_SERVER_LIQUID_ONION__}!g" mempool-config.json -sed -i "s!__EXTERNAL_DATA_SERVER_BISQ_URL__!${__EXTERNAL_DATA_SERVER_BISQ_URL__}!g" mempool-config.json -sed -i "s!__EXTERNAL_DATA_SERVER_BISQ_ONION__!${__EXTERNAL_DATA_SERVER_BISQ_ONION__}!g" mempool-config.json # LIGHTNING sed -i "s!__LIGHTNING_ENABLED__!${__LIGHTNING_ENABLED__}!g" mempool-config.json diff --git a/docker/frontend/entrypoint.sh b/docker/frontend/entrypoint.sh index 8749817bf..20f05e53c 100644 --- a/docker/frontend/entrypoint.sh +++ b/docker/frontend/entrypoint.sh @@ -20,8 +20,6 @@ __TESTNET_ENABLED__=${TESTNET_ENABLED:=false} __SIGNET_ENABLED__=${SIGNET_ENABLED:=false} __LIQUID_ENABLED__=${LIQUID_ENABLED:=false} __LIQUID_TESTNET_ENABLED__=${LIQUID_TESTNET_ENABLED:=false} -__BISQ_ENABLED__=${BISQ_ENABLED:=false} -__BISQ_SEPARATE_BACKEND__=${BISQ_SEPARATE_BACKEND:=false} __ITEMS_PER_PAGE__=${ITEMS_PER_PAGE:=10} __KEEP_BLOCKS_AMOUNT__=${KEEP_BLOCKS_AMOUNT:=8} __NGINX_PROTOCOL__=${NGINX_PROTOCOL:=http} @@ -32,7 +30,6 @@ __MEMPOOL_BLOCKS_AMOUNT__=${MEMPOOL_BLOCKS_AMOUNT:=8} __BASE_MODULE__=${BASE_MODULE:=mempool} __MEMPOOL_WEBSITE_URL__=${MEMPOOL_WEBSITE_URL:=https://mempool.space} __LIQUID_WEBSITE_URL__=${LIQUID_WEBSITE_URL:=https://liquid.network} -__BISQ_WEBSITE_URL__=${BISQ_WEBSITE_URL:=https://bisq.markets} __MINING_DASHBOARD__=${MINING_DASHBOARD:=true} __LIGHTNING__=${LIGHTNING:=false} __AUDIT__=${AUDIT:=false} @@ -48,8 +45,6 @@ export __TESTNET_ENABLED__ export __SIGNET_ENABLED__ export __LIQUID_ENABLED__ export __LIQUID_TESTNET_ENABLED__ -export __BISQ_ENABLED__ -export __BISQ_SEPARATE_BACKEND__ export __ITEMS_PER_PAGE__ export __KEEP_BLOCKS_AMOUNT__ export __NGINX_PROTOCOL__ @@ -60,7 +55,6 @@ export __MEMPOOL_BLOCKS_AMOUNT__ export __BASE_MODULE__ export __MEMPOOL_WEBSITE_URL__ export __LIQUID_WEBSITE_URL__ -export __BISQ_WEBSITE_URL__ export __MINING_DASHBOARD__ export __LIGHTNING__ export __AUDIT__ diff --git a/frontend/README.md b/frontend/README.md index 8fc77a2b4..069f1d5f0 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -22,14 +22,13 @@ cd mempool/frontend ### 2. Specify Website -The same frontend codebase is used for https://mempool.space, https://liquid.network and https://bisq.markets. +The same frontend codebase is used for https://mempool.space and https://liquid.network. Configure the frontend for the site you want by running the corresponding command: ``` $ npm run config:defaults:mempool $ npm run config:defaults:liquid -$ npm run config:defaults:bisq ``` ### 3. Run the Frontend diff --git a/frontend/mempool-frontend-config.sample.json b/frontend/mempool-frontend-config.sample.json index e598f2d03..31514a017 100644 --- a/frontend/mempool-frontend-config.sample.json +++ b/frontend/mempool-frontend-config.sample.json @@ -3,8 +3,6 @@ "SIGNET_ENABLED": false, "LIQUID_ENABLED": false, "LIQUID_TESTNET_ENABLED": false, - "BISQ_ENABLED": false, - "BISQ_SEPARATE_BACKEND": false, "ITEMS_PER_PAGE": 10, "KEEP_BLOCKS_AMOUNT": 8, "NGINX_PROTOCOL": "http", @@ -15,7 +13,6 @@ "BASE_MODULE": "mempool", "MEMPOOL_WEBSITE_URL": "https://mempool.space", "LIQUID_WEBSITE_URL": "https://liquid.network", - "BISQ_WEBSITE_URL": "https://bisq.markets", "MINING_DASHBOARD": true, "AUDIT": false, "MAINNET_BLOCK_AUDIT_START_HEIGHT": 0, diff --git a/frontend/package.json b/frontend/package.json index 38d05c4f1..205a54f80 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -38,9 +38,8 @@ "sync-assets": "rsync -av ./src/resources ./dist/mempool/browser && node sync-assets.js 'dist/mempool/browser/resources/'", "sync-assets-dev": "node sync-assets.js 'src/resources/'", "generate-config": "node generate-config.js", - "build-mempool.js": "npm run build-mempool-js && npm run build-mempool-liquid-js && npm run build-mempool-bisq-js", + "build-mempool.js": "npm run build-mempool-js && npm run build-mempool-liquid-js", "build-mempool-js": "browserify -p tinyify ./node_modules/@mempool/mempool.js/lib/index.js --standalone mempoolJS > ./dist/mempool/browser/en-US/mempool.js", - "build-mempool-bisq-js": "browserify -p tinyify ./node_modules/@mempool/mempool.js/lib/index-bisq.js --standalone bisqJS > ./dist/mempool/browser/en-US/bisq.js", "build-mempool-liquid-js": "browserify -p tinyify ./node_modules/@mempool/mempool.js/lib/index-liquid.js --standalone liquidJS > ./dist/mempool/browser/en-US/liquid.js", "test": "npm run ng -- test", "lint": "./node_modules/.bin/eslint . --ext .ts", @@ -51,17 +50,16 @@ "dev:ssr": "npm run generate-config && ng run mempool:serve-ssr", "serve:ssr": "npm run generate-config && node server.run.js", "build:ssr": "npm run build && ng run mempool:server:production && ./node_modules/typescript/bin/tsc server.run.ts", - "config:defaults:mempool": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true LIQUID_TESTNET_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 BASE_MODULE=mempool BLOCK_WEIGHT_UNITS=4000000 && npm run generate-config", - "config:defaults:liquid": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true LIQUID_TESTNET_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 BASE_MODULE=liquid BLOCK_WEIGHT_UNITS=300000 && npm run generate-config", - "config:defaults:bisq": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 BASE_MODULE=bisq BLOCK_WEIGHT_UNITS=4000000 && npm run generate-config", + "config:defaults:mempool": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true LIQUID_TESTNET_ENABLED=true ITEMS_PER_PAGE=25 BASE_MODULE=mempool BLOCK_WEIGHT_UNITS=4000000 && npm run generate-config", + "config:defaults:liquid": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true LIQUID_TESTNET_ENABLED=true ITEMS_PER_PAGE=25 BASE_MODULE=liquid BLOCK_WEIGHT_UNITS=300000 && npm run generate-config", "prerender": "npm run ng -- run mempool:prerender", "cypress:open": "cypress open", "cypress:run": "cypress run", "cypress:run:record": "cypress run --record", - "cypress:open:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:open", - "cypress:run:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:run:record", - "cypress:open:ci:staging": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-staging 4200 cypress:open", - "cypress:run:ci:staging": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-staging 4200 cypress:run:record" + "cypress:open:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:open", + "cypress:run:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:run:record", + "cypress:open:ci:staging": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-staging 4200 cypress:open", + "cypress:run:ci:staging": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-staging 4200 cypress:run:record" }, "dependencies": { "@angular-devkit/build-angular": "^16.1.1", diff --git a/frontend/proxy.conf.js b/frontend/proxy.conf.js index f5384bef0..b63d343e2 100644 --- a/frontend/proxy.conf.js +++ b/frontend/proxy.conf.js @@ -22,7 +22,6 @@ PROXY_CONFIG = [ { context: ['*', '/api/**', '!/api/v1/ws', - '!/bisq', '!/bisq/**', '!/bisq/', '!/liquid', '!/liquid/**', '!/liquid/', '!/liquidtestnet', '!/liquidtestnet/**', '!/liquidtestnet/', '/testnet/api/**', '/signet/api/**' @@ -39,16 +38,6 @@ PROXY_CONFIG = [ secure: false, changeOrigin: true, }, - { - context: ['/api/bisq**', '/bisq/api/**'], - target: "https://bisq.markets", - pathRewrite: { - "^/api/bisq/": "/bisq/api" - }, - ws: true, - secure: false, - changeOrigin: true - }, { context: ['/api/liquid**', '/liquid/api/**'], target: "https://liquid.network", diff --git a/frontend/proxy.conf.local-esplora.js b/frontend/proxy.conf.local-esplora.js index a7137f3bc..0cdc9d459 100644 --- a/frontend/proxy.conf.local-esplora.js +++ b/frontend/proxy.conf.local-esplora.js @@ -67,40 +67,6 @@ if (configContent && configContent.BASE_MODULE === 'liquid') { ]); } - -if (configContent && configContent.BASE_MODULE === 'bisq') { - PROXY_CONFIG.push(...[ - { - context: ['/bisq/api/v1/ws'], - target: `http://127.0.0.1:8999`, - secure: false, - ws: true, - changeOrigin: true, - proxyTimeout: 30000, - pathRewrite: { - "^/bisq": "" - }, - }, - { - context: ['/bisq/api/v1/**'], - target: `http://127.0.0.1:8999`, - secure: false, - changeOrigin: true, - proxyTimeout: 30000, - }, - { - context: ['/bisq/api/**'], - target: `http://127.0.0.1:8999`, - secure: false, - changeOrigin: true, - proxyTimeout: 30000, - pathRewrite: { - "^/bisq/api/": "/api/v1/bisq/" - }, - } - ]); -} - PROXY_CONFIG.push(...[ { context: ['/testnet/api/v1/lightning/**'], diff --git a/frontend/proxy.conf.local.js b/frontend/proxy.conf.local.js index 3a502e0ed..e7bfeee70 100644 --- a/frontend/proxy.conf.local.js +++ b/frontend/proxy.conf.local.js @@ -67,40 +67,6 @@ if (configContent && configContent.BASE_MODULE === 'liquid') { ]); } - -if (configContent && configContent.BASE_MODULE === 'bisq') { - PROXY_CONFIG.push(...[ - { - context: ['/bisq/api/v1/ws'], - target: `http://localhost:8999`, - secure: false, - ws: true, - changeOrigin: true, - proxyTimeout: 30000, - pathRewrite: { - "^/bisq": "" - }, - }, - { - context: ['/bisq/api/v1/**'], - target: `http://localhost:8999`, - secure: false, - changeOrigin: true, - proxyTimeout: 30000, - }, - { - context: ['/bisq/api/**'], - target: `http://localhost:8999`, - secure: false, - changeOrigin: true, - proxyTimeout: 30000, - pathRewrite: { - "^/bisq/api/": "/api/v1/bisq/" - }, - } - ]); -} - PROXY_CONFIG.push(...[ { context: ['/testnet/api/v1/lightning/**'], diff --git a/frontend/proxy.conf.mixed.js b/frontend/proxy.conf.mixed.js index 76bb06607..db8af5d95 100644 --- a/frontend/proxy.conf.mixed.js +++ b/frontend/proxy.conf.mixed.js @@ -61,39 +61,6 @@ if (configContent && configContent.BASE_MODULE === 'liquid') { ]); } -if (configContent && configContent.BASE_MODULE === 'bisq') { - PROXY_CONFIG.push(...[ - { - context: ['/bisq/api/v1/ws'], - target: `http://localhost:8999`, - secure: false, - ws: true, - changeOrigin: true, - proxyTimeout: 30000, - pathRewrite: { - "^/bisq": "" - }, - }, - { - context: ['/bisq/api/v1/**'], - target: `http://localhost:8999`, - secure: false, - changeOrigin: true, - proxyTimeout: 30000, - }, - { - context: ['/bisq/api/**'], - target: `http://localhost:8999`, - secure: false, - changeOrigin: true, - proxyTimeout: 30000, - pathRewrite: { - "^/bisq/api/": "/api/v1/bisq/" - }, - }, - ]); -} - PROXY_CONFIG.push(...[ { context: ['/api/v1/services/**'], diff --git a/frontend/proxy.conf.staging.js b/frontend/proxy.conf.staging.js index 0cf366ca7..e24662038 100644 --- a/frontend/proxy.conf.staging.js +++ b/frontend/proxy.conf.staging.js @@ -5,7 +5,6 @@ let PROXY_CONFIG = require('./proxy.conf'); PROXY_CONFIG.forEach(entry => { entry.target = entry.target.replace("mempool.space", "mempool-staging.fra.mempool.space"); entry.target = entry.target.replace("liquid.network", "liquid-staging.fra.mempool.space"); - entry.target = entry.target.replace("bisq.markets", "bisq-staging.fra.mempool.space"); }); module.exports = PROXY_CONFIG; diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index 1fe196090..78811a6b7 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -170,13 +170,6 @@ let routes: Routes = [ }, ]; -if (browserWindowEnv && browserWindowEnv.BASE_MODULE === 'bisq') { - routes = [{ - path: '', - loadChildren: () => import('./bisq/bisq.module').then(m => m.BisqModule) - }]; -} - if (browserWindowEnv && browserWindowEnv.BASE_MODULE === 'liquid') { routes = [ { diff --git a/frontend/src/app/bisq/bisq-address/bisq-address.component.html b/frontend/src/app/bisq/bisq-address/bisq-address.component.html deleted file mode 100644 index 6b0d27c2c..000000000 --- a/frontend/src/app/bisq/bisq-address/bisq-address.component.html +++ /dev/null @@ -1,108 +0,0 @@ -
-

Address

- - - - - -
- -
- - -
- -
-
- - - - - - - - - - - - - - - -
Total received{{ totalReceived / 100 | number: '1.2-2' }} BSQ
Total sent{{ totalSent / 100 | number: '1.2-2' }} BSQ
Balance{{ (totalReceived - totalSent) / 100 | number: '1.2-2' }} BSQ
-
-
-
-
- -
-
-
- -
- -
- -

- - {{ i }} transaction - {{ i }} transactions -

- - - -
- - {{ tx.id | shortenString : 16 }} - {{ tx.id }} - -
- ‎{{ tx.time | date:'yyyy-MM-dd HH:mm' }} -
-
-
- - - -
- - - - - - -
-
-
- - - - - - - - - - - - -
-
-
-
- -
-
-
- - - - - - Error loading address data. - - - -
- -
\ No newline at end of file diff --git a/frontend/src/app/bisq/bisq-address/bisq-address.component.scss b/frontend/src/app/bisq/bisq-address/bisq-address.component.scss deleted file mode 100644 index e7d0a9fd0..000000000 --- a/frontend/src/app/bisq/bisq-address/bisq-address.component.scss +++ /dev/null @@ -1,75 +0,0 @@ -.qr-wrapper { - background-color: #FFF; - padding: 10px; - padding-bottom: 5px; - display: inline-block; -} - -.qrcode-col { - text-align: center; -} - -.qrcode-col > div { - margin: 20px auto 5px; - @media (min-width: 768px) { - text-align: center; - margin: auto; - } -} - -.fiat { - display: block; - font-size: 13px; - @media (min-width: 768px) { - display: inline-block; - font-size: 14px; - margin-left: 10px; - } -} -.table { - tr td { - &:last-child { - text-align: right; - @media (min-width: 768px) { - text-align: left; - } - } - } -} - -h1 { - margin: 0px; - padding: 0px; - @media (min-width: 576px) { - float: left; - margin-right: 10px; - } -} - -.address-link { - line-height: 26px; - margin-left: 0px; - top: 14px; - position: relative; - display: flex; - flex-direction: row; - @media (min-width: 768px) { - line-height: 38px; - } -} - -.row{ - flex-direction: column; - @media (min-width: 576px) { - flex-direction: row; - } -} - -@media (max-width: 767.98px) { - .mobile-bottomcol { - margin-top: 15px; - } - .details-table td:first-child { - white-space: pre-wrap; - } -} \ No newline at end of file diff --git a/frontend/src/app/bisq/bisq-address/bisq-address.component.ts b/frontend/src/app/bisq/bisq-address/bisq-address.component.ts deleted file mode 100644 index 1e4f0a178..000000000 --- a/frontend/src/app/bisq/bisq-address/bisq-address.component.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { SeoService } from '../../services/seo.service'; -import { switchMap, filter, catchError } from 'rxjs/operators'; -import { ParamMap, ActivatedRoute } from '@angular/router'; -import { Subscription, of } from 'rxjs'; -import { BisqTransaction } from '../bisq.interfaces'; -import { BisqApiService } from '../bisq-api.service'; -import { WebsocketService } from '../../services/websocket.service'; - -@Component({ - selector: 'app-bisq-address', - templateUrl: './bisq-address.component.html', - styleUrls: ['./bisq-address.component.scss'] -}) -export class BisqAddressComponent implements OnInit, OnDestroy { - transactions: BisqTransaction[]; - addressString: string; - isLoadingAddress = true; - error: any; - mainSubscription: Subscription; - - totalReceived = 0; - totalSent = 0; - - constructor( - private websocketService: WebsocketService, - private route: ActivatedRoute, - private seoService: SeoService, - private bisqApiService: BisqApiService, - ) { } - - ngOnInit() { - this.websocketService.want(['blocks']); - - this.mainSubscription = this.route.paramMap - .pipe( - switchMap((params: ParamMap) => { - this.error = undefined; - this.isLoadingAddress = true; - this.transactions = null; - document.body.scrollTo(0, 0); - this.addressString = params.get('id') || ''; - this.seoService.setTitle($localize`:@@bisq-address.component.browser-title:Address: ${this.addressString}:INTERPOLATION:`); - this.seoService.setDescription($localize`:@@meta.description.bisq.address:See current balance, pending transactions, and history of confirmed transactions for BSQ address ${this.addressString}:INTERPOLATION:.`); - - return this.bisqApiService.getAddress$(this.addressString) - .pipe( - catchError((err) => { - this.isLoadingAddress = false; - this.error = err; - this.seoService.logSoft404(); - console.log(err); - return of(null); - }) - ); - }), - filter((transactions) => transactions !== null) - ) - .subscribe((transactions: BisqTransaction[]) => { - this.transactions = transactions; - this.updateChainStats(); - this.isLoadingAddress = false; - }, - (error) => { - console.log(error); - this.error = error; - this.seoService.logSoft404(); - this.isLoadingAddress = false; - }); - } - - updateChainStats() { - const shortenedAddress = this.addressString.substr(1); - - this.totalSent = this.transactions.reduce((acc, tx) => - acc + tx.inputs - .filter((input) => input.address === shortenedAddress) - .reduce((a, input) => a + input.bsqAmount, 0), 0); - - this.totalReceived = this.transactions.reduce((acc, tx) => - acc + tx.outputs - .filter((output) => output.address === shortenedAddress) - .reduce((a, output) => a + output.bsqAmount, 0), 0); - } - - ngOnDestroy() { - this.mainSubscription.unsubscribe(); - } -} diff --git a/frontend/src/app/bisq/bisq-api.service.ts b/frontend/src/app/bisq/bisq-api.service.ts deleted file mode 100644 index 2d8994d86..000000000 --- a/frontend/src/app/bisq/bisq-api.service.ts +++ /dev/null @@ -1,78 +0,0 @@ -import { Injectable } from '@angular/core'; -import { HttpClient, HttpResponse, HttpParams } from '@angular/common/http'; -import { Observable } from 'rxjs'; -import { BisqTransaction, BisqBlock, BisqStats, MarketVolume, Trade, Markets, Tickers, Offers, Currencies, HighLowOpenClose, SummarizedInterval } from './bisq.interfaces'; - -const API_BASE_URL = '/bisq/api'; - -@Injectable({ - providedIn: 'root' -}) -export class BisqApiService { - apiBaseUrl: string; - - constructor( - private httpClient: HttpClient, - ) { } - - getStats$(): Observable { - return this.httpClient.get(API_BASE_URL + '/stats'); - } - - getTransaction$(txId: string): Observable { - return this.httpClient.get(API_BASE_URL + '/tx/' + txId); - } - - listTransactions$(start: number, length: number, types: string[]): Observable> { - let params = new HttpParams(); - types.forEach((t: string) => { - params = params.append('types[]', t); - }); - return this.httpClient.get(API_BASE_URL + `/txs/${start}/${length}`, { params, observe: 'response' }); - } - - getBlock$(hash: string): Observable { - return this.httpClient.get(API_BASE_URL + '/block/' + hash); - } - - listBlocks$(start: number, length: number): Observable> { - return this.httpClient.get(API_BASE_URL + `/blocks/${start}/${length}`, { observe: 'response' }); - } - - getAddress$(address: string): Observable { - return this.httpClient.get(API_BASE_URL + '/address/' + address); - } - - getMarkets$(): Observable { - return this.httpClient.get(API_BASE_URL + '/markets/markets'); - } - - getMarketsTicker$(): Observable { - return this.httpClient.get(API_BASE_URL + '/markets/ticker'); - } - - getMarketsCurrencies$(): Observable { - return this.httpClient.get(API_BASE_URL + '/markets/currencies'); - } - - getMarketsHloc$(market: string, interval: 'minute' | 'half_hour' | 'hour' | 'half_day' | 'day' - | 'week' | 'month' | 'year' | 'auto'): Observable { - return this.httpClient.get(API_BASE_URL + '/markets/hloc?market=' + market + '&interval=' + interval); - } - - getMarketOffers$(market: string): Observable { - return this.httpClient.get(API_BASE_URL + '/markets/offers?market=' + market); - } - - getMarketTrades$(market: string): Observable { - return this.httpClient.get(API_BASE_URL + '/markets/trades?market=' + market); - } - - getMarketVolumesByTime$(period: string): Observable { - return this.httpClient.get(API_BASE_URL + '/markets/volumes/' + period); - } - - getAllVolumesDay$(): Observable { - return this.httpClient.get(API_BASE_URL + '/markets/volumes?interval=week'); - } -} diff --git a/frontend/src/app/bisq/bisq-block/bisq-block.component.html b/frontend/src/app/bisq/bisq-block/bisq-block.component.html deleted file mode 100644 index 4f79d8838..000000000 --- a/frontend/src/app/bisq/bisq-block/bisq-block.component.html +++ /dev/null @@ -1,114 +0,0 @@ -
- -
-

Block

-
- - {{ blockHeight }} - -
- - - -
-
-
- - - - - - - - - - -
Hash{{ block.hash | shortenString : 13 }}
Timestamp - ‎{{ block.time | date:'yyyy-MM-dd HH:mm' }} -
- () -
-
-
-
- - - - - - -
Previous hash{{ block.previousBlockHash | shortenString : 13 }}
-
-
-
- -
- -
- -

- - {{ i }} transaction - {{ i }} transactions -

- - - -
- - {{ tx.id | shortenString : 16 }} - {{ tx.id }} - -
- ‎{{ tx.time | date:'yyyy-MM-dd HH:mm' }} -
-
-
- - - -
- - - - - -
-
-
- - - - - - - - - - -
Hash
Timestamp
-
-
- - - - - - -
Previous hash
-
-
-
- - - -
- -
- Error loading block -
- {{ error.status }}: {{ error.statusText }} -
- - -
\ No newline at end of file diff --git a/frontend/src/app/bisq/bisq-block/bisq-block.component.scss b/frontend/src/app/bisq/bisq-block/bisq-block.component.scss deleted file mode 100644 index 04e0e1a35..000000000 --- a/frontend/src/app/bisq/bisq-block/bisq-block.component.scss +++ /dev/null @@ -1,44 +0,0 @@ -.td-width { - width: 140px; - @media (min-width: 768px) { - width: 175px; - } -} - -h1 { - margin: 0px; - padding: 0px; - @media (min-width: 576px) { - float: left; - margin-right: 10px; - } -} - -.row{ - flex-direction: column; - @media (min-width: 768px) { - flex-direction: row; - } -} - -.block-container { - .table { - tr td { - &:last-child { - text-align: right; - @media (min-width: 992px) { - text-align: left; - } - } - } - } - .fiat { - display: block; - font-size: 13px; - @media (min-width: 992px) { - display: inline-block; - font-size: 14px; - margin-left: 10px; - } - } -} \ No newline at end of file diff --git a/frontend/src/app/bisq/bisq-block/bisq-block.component.ts b/frontend/src/app/bisq/bisq-block/bisq-block.component.ts deleted file mode 100644 index 59bb16a9e..000000000 --- a/frontend/src/app/bisq/bisq-block/bisq-block.component.ts +++ /dev/null @@ -1,106 +0,0 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { BisqBlock } from '../../bisq/bisq.interfaces'; -import { Location } from '@angular/common'; -import { BisqApiService } from '../bisq-api.service'; -import { ActivatedRoute, ParamMap, Router } from '@angular/router'; -import { Subscription, of } from 'rxjs'; -import { switchMap, catchError } from 'rxjs/operators'; -import { SeoService } from '../../services/seo.service'; -import { ElectrsApiService } from '../../services/electrs-api.service'; -import { HttpErrorResponse } from '@angular/common/http'; -import { WebsocketService } from '../../services/websocket.service'; - -@Component({ - selector: 'app-bisq-block', - templateUrl: './bisq-block.component.html', - styleUrls: ['./bisq-block.component.scss'] -}) -export class BisqBlockComponent implements OnInit, OnDestroy { - block: BisqBlock; - subscription: Subscription; - blockHash = ''; - blockHeight = 0; - isLoading = true; - error: HttpErrorResponse | null; - - constructor( - private websocketService: WebsocketService, - private bisqApiService: BisqApiService, - private route: ActivatedRoute, - private seoService: SeoService, - private electrsApiService: ElectrsApiService, - private router: Router, - private location: Location, - ) { } - - ngOnInit(): void { - this.websocketService.want(['blocks']); - - this.subscription = this.route.paramMap - .pipe( - switchMap((params: ParamMap) => { - const blockHash = params.get('id') || ''; - document.body.scrollTo(0, 0); - this.isLoading = true; - this.error = null; - if (history.state.data && history.state.data.blockHeight) { - this.blockHeight = history.state.data.blockHeight; - } - if (history.state.data && history.state.data.block) { - this.blockHeight = history.state.data.block.height; - return of(history.state.data.block); - } - - let isBlockHeight = false; - if (/^[0-9]+$/.test(blockHash)) { - isBlockHeight = true; - } else { - this.blockHash = blockHash; - } - - if (isBlockHeight) { - return this.electrsApiService.getBlockHashFromHeight$(parseInt(blockHash, 10)) - .pipe( - switchMap((hash) => { - if (!hash) { - return; - } - this.blockHash = hash; - this.location.replaceState( - this.router.createUrlTree(['/bisq/block/', hash]).toString() - ); - this.seoService.updateCanonical(this.location.path()); - return this.bisqApiService.getBlock$(this.blockHash) - .pipe(catchError(this.caughtHttpError.bind(this))); - }), - catchError(this.caughtHttpError.bind(this)) - ); - } - - return this.bisqApiService.getBlock$(this.blockHash) - .pipe(catchError(this.caughtHttpError.bind(this))); - }) - ) - .subscribe((block: BisqBlock) => { - if (!block) { - this.seoService.logSoft404(); - return; - } - this.isLoading = false; - this.blockHeight = block.height; - this.seoService.setTitle($localize`:@@bisq-block.component.browser-title:Block ${block.height}:BLOCK_HEIGHT:: ${block.hash}:BLOCK_HASH:`); - this.seoService.setDescription($localize`:@@meta.description.bisq.block:See all BSQ transactions in Bitcoin block ${block.height}:BLOCK_HEIGHT: (block hash ${block.hash}:BLOCK_HASH:).`); - this.block = block; - }); - } - - ngOnDestroy() { - this.subscription.unsubscribe(); - } - - caughtHttpError(err: HttpErrorResponse){ - this.error = err; - this.seoService.logSoft404(); - return of(null); - } -} diff --git a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html deleted file mode 100644 index 15f15b258..000000000 --- a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html +++ /dev/null @@ -1,40 +0,0 @@ -
-

BSQ Blocks

-
- -
- - - -
- - - - - - - - - - - - - - - -
HeightConfirmedTotal sentTransactions
{{ block.height }}{{ calculateTotalOutput(block) / 100 | number: '1.2-2' }} BSQ{{ block.txs.length }}
-
- -
- - -
-
- -
- - - - - - diff --git a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.scss b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.scss deleted file mode 100644 index e8db46928..000000000 --- a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.scss +++ /dev/null @@ -1,6 +0,0 @@ -.pagination-container { - float: none; - @media(min-width: 400px){ - float: right; - } -} diff --git a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts deleted file mode 100644 index 7ab742655..000000000 --- a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts +++ /dev/null @@ -1,91 +0,0 @@ -import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core'; -import { BisqApiService } from '../bisq-api.service'; -import { switchMap, map, take, mergeMap, tap } from 'rxjs/operators'; -import { Observable } from 'rxjs'; -import { BisqBlock, BisqOutput, BisqTransaction } from '../bisq.interfaces'; -import { SeoService } from '../../services/seo.service'; -import { ActivatedRoute, Router } from '@angular/router'; -import { WebsocketService } from '../../services/websocket.service'; - -@Component({ - selector: 'app-bisq-blocks', - templateUrl: './bisq-blocks.component.html', - styleUrls: ['./bisq-blocks.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class BisqBlocksComponent implements OnInit { - blocks$: Observable<[BisqBlock[], number]>; - page = 1; - itemsPerPage: number; - contentSpace = window.innerHeight - (165 + 75); - fiveItemsPxSize = 250; - loadingItems: number[]; - isLoading = true; - // @ts-ignore - paginationSize: 'sm' | 'lg' = 'md'; - paginationMaxSize = 5; - - constructor( - private websocketService: WebsocketService, - private bisqApiService: BisqApiService, - private seoService: SeoService, - private route: ActivatedRoute, - private router: Router, - ) { } - - ngOnInit(): void { - this.websocketService.want(['blocks']); - this.seoService.setTitle($localize`:@@8a7b4bd44c0ac71b2e72de0398b303257f7d2f54:Blocks`); - this.seoService.setDescription($localize`:@@meta.description.bisq.blocks:See a list of recent Bitcoin blocks with BSQ transactions, total BSQ sent per block, and more.`); - this.itemsPerPage = Math.max(Math.round(this.contentSpace / this.fiveItemsPxSize) * 5, 10); - this.loadingItems = Array(this.itemsPerPage); - if (document.body.clientWidth < 670) { - this.paginationSize = 'sm'; - this.paginationMaxSize = 3; - } - - this.blocks$ = this.route.queryParams - .pipe( - take(1), - tap((qp) => { - if (qp.page) { - this.page = parseInt(qp.page, 10); - } - }), - mergeMap(() => this.route.queryParams), - map((queryParams) => { - if (queryParams.page) { - const newPage = parseInt(queryParams.page, 10); - this.page = newPage; - return newPage; - } else { - this.page = 1; - } - return 1; - }), - switchMap((page) => this.bisqApiService.listBlocks$((page - 1) * this.itemsPerPage, this.itemsPerPage)), - map((response) => [response.body, parseInt(response.headers.get('x-total-count'), 10)]), - ); - } - - calculateTotalOutput(block: BisqBlock): number { - return block.txs.reduce((a: number, tx: BisqTransaction) => - a + tx.outputs.reduce((acc: number, output: BisqOutput) => acc + output.bsqAmount, 0), 0 - ); - } - - trackByFn(index: number) { - return index; - } - - pageChange(page: number) { - this.router.navigate([], { - queryParams: { page: page }, - queryParamsHandling: 'merge', - }); - } - - onResize(event: any) { - this.paginationMaxSize = event.target.innerWidth < 670 ? 3 : 5; - } -} diff --git a/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.html b/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.html deleted file mode 100644 index 132384fa9..000000000 --- a/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.html +++ /dev/null @@ -1,63 +0,0 @@ -
- -

Bisq Trading Volume

- -
- -
- -
- - - - -
- -

- -
-

- Markets - Bitcoin Markets -

- -
- - - - - - - - - - - - - - - -
Currency PriceVolume (7d) Trades (7d)
{{ ticker.name }}) - - - {{ ticker.last | currency: ticker.market.rsymbol }} - - - - {{ ticker.volume?.num_trades ? ticker.volume?.num_trades : 0 }}
-
- -

- -

Latest Trades

- - - -
-
- - - - - - diff --git a/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.scss b/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.scss deleted file mode 100644 index 6248f9461..000000000 --- a/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.scss +++ /dev/null @@ -1,22 +0,0 @@ -#volumeHolder { - height: 500px; - background-color: #000; - overflow: hidden; - display: flex; - justify-content: center; -} - -.table { - max-width: 100%; - overflow: scroll; -} - -.loadingVolumes { - position: relative; - top: 45%; - z-index: 100; -} - -.container-info{ - overflow-x: scroll; -} \ No newline at end of file diff --git a/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts b/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts deleted file mode 100644 index 8834d09e9..000000000 --- a/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts +++ /dev/null @@ -1,132 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; -import { Observable, combineLatest, BehaviorSubject, of } from 'rxjs'; -import { map, share, switchMap } from 'rxjs/operators'; -import { SeoService } from '../../services/seo.service'; -import { StateService } from '../../services/state.service'; -import { WebsocketService } from '../../services/websocket.service'; -import { BisqApiService } from '../bisq-api.service'; -import { Trade } from '../bisq.interfaces'; - -@Component({ - selector: 'app-bisq-dashboard', - templateUrl: './bisq-dashboard.component.html', - styleUrls: ['./bisq-dashboard.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class BisqDashboardComponent implements OnInit { - tickers$: Observable; - volumes$: Observable; - trades$: Observable; - sort$ = new BehaviorSubject('trades'); - - allowCryptoCoins = ['usdc', 'l-btc', 'bsq']; - - constructor( - private websocketService: WebsocketService, - private bisqApiService: BisqApiService, - public stateService: StateService, - private seoService: SeoService, - ) { } - - ngOnInit(): void { - this.seoService.setTitle($localize`:@@meta.title.bisq.markets:Markets`); - this.seoService.setDescription($localize`:@@meta.description.bisq.markets:Explore the full Bitcoin ecosystem with The Mempool Open Source Project®. See Bisq market prices, trading activity, and more.`); - this.websocketService.want(['blocks']); - - this.volumes$ = this.bisqApiService.getAllVolumesDay$() - .pipe( - map((volumes) => { - const data = volumes.map((volume) => { - return { - time: volume.period_start, - value: volume.volume, - }; - }); - - const linesData = volumes.map((volume) => { - return { - time: volume.period_start, - value: volume.num_trades, - }; - }); - - return { - data: data, - linesData: linesData, - }; - }) - ); - - const getMarkets = this.bisqApiService.getMarkets$().pipe(share()); - - this.tickers$ = combineLatest([ - this.bisqApiService.getMarketsTicker$(), - getMarkets, - this.bisqApiService.getMarketVolumesByTime$('7d'), - ]) - .pipe( - map(([tickers, markets, volumes]) => { - - const newTickers = []; - for (const t in tickers) { - - if (this.stateService.env.BASE_MODULE !== 'bisq') { - const pair = t.split('_'); - if (pair[1] === 'btc' && this.allowCryptoCoins.indexOf(pair[0]) === -1) { - continue; - } - } - - const mappedTicker: any = tickers[t]; - - mappedTicker.pair_url = t; - mappedTicker.pair = t.replace('_', '/').toUpperCase(); - mappedTicker.market = markets[t]; - mappedTicker.volume = volumes[t]; - mappedTicker.name = `${mappedTicker.market.rtype === 'crypto' ? mappedTicker.market.lname : mappedTicker.market.rname} (${mappedTicker.market.rtype === 'crypto' ? mappedTicker.market.lsymbol : mappedTicker.market.rsymbol}`; - newTickers.push(mappedTicker); - } - return newTickers; - }), - switchMap((tickers) => combineLatest([this.sort$, of(tickers)])), - map(([sort, tickers]) => { - if (sort === 'trades') { - tickers.sort((a, b) => (b.volume && b.volume.num_trades || 0) - (a.volume && a.volume.num_trades || 0)); - } else if (sort === 'volumes') { - tickers.sort((a, b) => (b.volume && b.volume.volume || 0) - (a.volume && a.volume.volume || 0)); - } else if (sort === 'name') { - tickers.sort((a, b) => a.name.localeCompare(b.name)); - } - return tickers; - }) - ); - - this.trades$ = combineLatest([ - this.bisqApiService.getMarketTrades$('all'), - getMarkets, - ]) - .pipe( - map(([trades, markets]) => { - if (this.stateService.env.BASE_MODULE !== 'bisq') { - trades = trades.filter((trade) => { - const pair = trade.market.split('_'); - return !(pair[1] === 'btc' && this.allowCryptoCoins.indexOf(pair[0]) === -1); - }); - } - return trades.map((trade => { - trade._market = markets[trade.market]; - return trade; - })); - }) - ); - } - - trackByFn(index: number) { - return index; - } - - sort(by: string) { - this.sort$.next(by); - } - -} diff --git a/frontend/src/app/bisq/bisq-icon/bisq-icon.component.html b/frontend/src/app/bisq/bisq-icon/bisq-icon.component.html deleted file mode 100644 index 5ea603892..000000000 --- a/frontend/src/app/bisq/bisq-icon/bisq-icon.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/frontend/src/app/bisq/bisq-icon/bisq-icon.component.scss b/frontend/src/app/bisq/bisq-icon/bisq-icon.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/frontend/src/app/bisq/bisq-icon/bisq-icon.component.ts b/frontend/src/app/bisq/bisq-icon/bisq-icon.component.ts deleted file mode 100644 index 6137d5aa6..000000000 --- a/frontend/src/app/bisq/bisq-icon/bisq-icon.component.ts +++ /dev/null @@ -1,87 +0,0 @@ -import { Component, ChangeDetectionStrategy, Input, OnChanges } from '@angular/core'; -import { IconPrefix, IconName } from '@fortawesome/fontawesome-common-types'; - -@Component({ - selector: 'app-bisq-icon', - templateUrl: './bisq-icon.component.html', - styleUrls: ['./bisq-icon.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class BisqIconComponent implements OnChanges { - @Input() txType: string; - - iconProp: [IconPrefix, IconName] = ['fas', 'leaf']; - color: string; - - constructor() { } - - ngOnChanges() { - switch (this.txType) { - case 'UNVERIFIED': - this.iconProp[1] = 'question'; - this.color = 'ffac00'; - break; - case 'INVALID': - this.iconProp[1] = 'exclamation-triangle'; - this.color = 'ff4500'; - break; - case 'GENESIS': - this.iconProp[1] = 'rocket'; - this.color = '25B135'; - break; - case 'TRANSFER_BSQ': - this.iconProp[1] = 'retweet'; - this.color = 'a3a3a3'; - break; - case 'PAY_TRADE_FEE': - this.iconProp[1] = 'leaf'; - this.color = '689f43'; - break; - case 'PROPOSAL': - this.iconProp[1] = 'file-alt'; - this.color = '6c8b3b'; - break; - case 'COMPENSATION_REQUEST': - this.iconProp[1] = 'money-bill'; - this.color = '689f43'; - break; - case 'REIMBURSEMENT_REQUEST': - this.iconProp[1] = 'money-bill'; - this.color = '04a908'; - break; - case 'BLIND_VOTE': - this.iconProp[1] = 'eye-slash'; - this.color = '07579a'; - break; - case 'VOTE_REVEAL': - this.iconProp[1] = 'eye'; - this.color = '4AC5FF'; - break; - case 'LOCKUP': - this.iconProp[1] = 'lock'; - this.color = '0056c4'; - break; - case 'UNLOCK': - this.iconProp[1] = 'lock-open'; - this.color = '1d965f'; - break; - case 'ASSET_LISTING_FEE': - this.iconProp[1] = 'file-alt'; - this.color = '6c8b3b'; - break; - case 'PROOF_OF_BURN': - this.iconProp[1] = 'file-alt'; - this.color = '6c8b3b'; - break; - case 'IRREGULAR': - this.iconProp[1] = 'exclamation-circle'; - this.color = 'ffd700'; - break; - default: - this.iconProp[1] = 'question'; - this.color = 'ffac00'; - } - // @ts-ignore - this.iconProp = this.iconProp.slice(); - } -} diff --git a/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html b/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html deleted file mode 100644 index cd99d6ed3..000000000 --- a/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html +++ /dev/null @@ -1,124 +0,0 @@ -
- -
- -
-
-
-
-
Bisq Price Index
-
- - {{ usdPrice | currency:'USD':'symbol':'1.2-2' }} - -
-
-
-
-
-
-
-
Bisq Market Price
-
- - {{ bisqMarketPrice | currency:'USD':'symbol':'1.2-2' }} - -
-
-
-
-
- -
-
-
-
-
US Dollar - BTC/USD
-
- - - -
-
-
-
-
-
-
-
Bisq Trading Volume
-
- - - -
-
-
-
-
- -
- - -
-
-
-
- Markets - Bitcoin Markets -
- -
- - - - - - - - - - - - - -
Currency PriceTrades (7d)
{{ ticker.name }}) - - - {{ ticker.last | currency: ticker.market.rsymbol }} - - {{ ticker.volume?.num_trades ? ticker.volume?.num_trades : 0 }}
-
- -
View more »
-
-
-
-
-
-
-
Latest Trades
- -
View more »
-
-
-
- -
- -
- - - - - - - - -
- -
- - - -
- diff --git a/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.scss b/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.scss deleted file mode 100644 index 4eeeee64e..000000000 --- a/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.scss +++ /dev/null @@ -1,112 +0,0 @@ -#volumeHolder { - height: 500px; - background-color: #000; - overflow: hidden; - display: flex; - justify-content: center; -} - -.table { - max-width: 100%; - overflow: scroll; -} - -.loadingGraphs { - position: relative; - top: 45%; - z-index: 100; -} - -.table-container { - overflow: scroll; - scrollbar-width: none; - font-size: 13px; - &::-webkit-scrollbar { - display: none; - } - @media(min-width: 576px){ - font-size: 16px; - } - thead th{ - text-align: right; - &:first-child { - text-align: left; - } - &:nth-child(3) { - display: none; - @media(min-width: 1100px){ - display: table-cell; - } - } - } - tr { - td { - text-align: right; - &:first-child { - text-align: left; - } - &:nth-child(3) { - display: none; - @media(min-width: 1100px){ - display: table-cell; - } - } - } - } -} - - -.chart-container { - height: 300px; -} - -.big-fiat { - color: #3bcc49; - font-size: 26px; -} - - - .card { - background-color: #1d1f31; - height: 100%; - } - - .card-title { - color: #4a68b9; - font-size: 1rem; - } - - .info-block { - float: left; - width: 350px; - line-height: 25px; - } - - .progress { - display: inline-flex; - width: 100%; - background-color: #2d3348; - height: 1.1rem; - } - - .bg-warning { - background-color: #b58800 !important; - } - - .skeleton-loader { - max-width: 100%; - &.shorter { - max-width: 150px; - } - } - - .more-padding { - padding: 1.25rem 2rem 1.25rem 2rem; - } - - .graph-card { - height: 100%; - @media (min-width: 992px) { - height: 385px; - } - } diff --git a/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.ts b/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.ts deleted file mode 100644 index e7e4471c9..000000000 --- a/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.ts +++ /dev/null @@ -1,193 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; -import { Observable, combineLatest, BehaviorSubject, of } from 'rxjs'; -import { map, share, switchMap } from 'rxjs/operators'; -import { SeoService } from '../../services/seo.service'; -import { StateService } from '../../services/state.service'; -import { WebsocketService } from '../../services/websocket.service'; -import { BisqApiService } from '../bisq-api.service'; -import { Trade } from '../bisq.interfaces'; - -@Component({ - selector: 'app-main-bisq-dashboard', - templateUrl: './bisq-main-dashboard.component.html', - styleUrls: ['./bisq-main-dashboard.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class BisqMainDashboardComponent implements OnInit { - tickers$: Observable; - volumes$: Observable; - trades$: Observable; - sort$ = new BehaviorSubject('trades'); - hlocData$: Observable; - usdPrice$: Observable; - isLoadingGraph = true; - bisqMarketPrice = 0; - - allowCryptoCoins = ['usdc', 'l-btc', 'bsq']; - - constructor( - private websocketService: WebsocketService, - private bisqApiService: BisqApiService, - public stateService: StateService, - private seoService: SeoService, - ) { } - - ngOnInit(): void { - this.seoService.resetTitle(); - this.seoService.resetDescription(); - this.websocketService.want(['blocks']); - - this.usdPrice$ = this.stateService.conversions$.asObservable().pipe( - map((conversions) => conversions.USD) - ); - - this.volumes$ = this.bisqApiService.getAllVolumesDay$() - .pipe( - map((volumes) => { - const data = volumes.map((volume) => { - return { - time: volume.period_start, - value: volume.volume, - }; - }); - - const linesData = volumes.map((volume) => { - return { - time: volume.period_start, - value: volume.num_trades, - }; - }); - - return { - data: data, - linesData: linesData, - }; - }) - ); - - const getMarkets = this.bisqApiService.getMarkets$().pipe(share()); - - this.tickers$ = combineLatest([ - this.bisqApiService.getMarketsTicker$(), - getMarkets, - this.bisqApiService.getMarketVolumesByTime$('7d'), - ]) - .pipe( - map(([tickers, markets, volumes]) => { - - const newTickers = []; - for (const t in tickers) { - - if (this.stateService.env.BASE_MODULE !== 'bisq') { - const pair = t.split('_'); - if (pair[1] === 'btc' && this.allowCryptoCoins.indexOf(pair[0]) === -1) { - continue; - } - } - - const mappedTicker: any = tickers[t]; - - mappedTicker.pair_url = t; - mappedTicker.pair = t.replace('_', '/').toUpperCase(); - mappedTicker.market = markets[t]; - mappedTicker.volume = volumes[t]; - mappedTicker.name = `${mappedTicker.market.rtype === 'crypto' ? mappedTicker.market.lname : mappedTicker.market.rname} (${mappedTicker.market.rtype === 'crypto' ? mappedTicker.market.lsymbol : mappedTicker.market.rsymbol}`; - newTickers.push(mappedTicker); - } - return newTickers; - }), - switchMap((tickers) => combineLatest([this.sort$, of(tickers)])), - map(([sort, tickers]) => { - if (sort === 'trades') { - tickers.sort((a, b) => (b.volume && b.volume.num_trades || 0) - (a.volume && a.volume.num_trades || 0)); - } else if (sort === 'volumes') { - tickers.sort((a, b) => (b.volume && b.volume.volume || 0) - (a.volume && a.volume.volume || 0)); - } else if (sort === 'name') { - tickers.sort((a, b) => a.name.localeCompare(b.name)); - } - return tickers.slice(0, 10); - }) - ); - - this.trades$ = combineLatest([ - this.bisqApiService.getMarketTrades$('all'), - getMarkets, - ]) - .pipe( - map(([trades, markets]) => { - if (this.stateService.env.BASE_MODULE !== 'bisq') { - trades = trades.filter((trade) => { - const pair = trade.market.split('_'); - return !(pair[1] === 'btc' && this.allowCryptoCoins.indexOf(pair[0]) === -1); - }); - } - return trades.map((trade => { - trade._market = markets[trade.market]; - return trade; - })).slice(0, 10); - }) - ); - - this.hlocData$ = this.bisqApiService.getMarketsHloc$('btc_usd', 'day') - .pipe( - map((hlocData) => { - this.isLoadingGraph = false; - - hlocData = hlocData.map((h) => { - h.time = h.period_start; - return h; - }); - - const hlocVolume = hlocData.map((h) => { - return { - time: h.time, - value: h.volume_right, - color: h.close > h.avg ? 'rgba(0, 41, 74, 0.7)' : 'rgba(0, 41, 74, 1)', - }; - }); - - // Add whitespace - if (hlocData.length > 1) { - const newHloc = []; - newHloc.push(hlocData[0]); - - const period = 86400; - let periods = 0; - const startingDate = hlocData[0].period_start; - let index = 1; - while (true) { - periods++; - if (hlocData[index].period_start > startingDate + period * periods) { - newHloc.push({ - time: startingDate + period * periods, - }); - } else { - newHloc.push(hlocData[index]); - index++; - if (!hlocData[index]) { - break; - } - } - } - hlocData = newHloc; - } - - this.bisqMarketPrice = hlocData[hlocData.length - 1].close; - - return { - hloc: hlocData, - volume: hlocVolume, - }; - }), - ); - } - - trackByFn(index: number) { - return index; - } - - sort(by: string) { - this.sort$.next(by); - } - -} diff --git a/frontend/src/app/bisq/bisq-market/bisq-market.component.html b/frontend/src/app/bisq/bisq-market/bisq-market.component.html deleted file mode 100644 index bcf890d40..000000000 --- a/frontend/src/app/bisq/bisq-market/bisq-market.component.html +++ /dev/null @@ -1,112 +0,0 @@ -
- - - - -

{{ currency.market.rtype === 'crypto' ? currency.market.lname : currency.market.rname }} - {{ currency.pair }}

-
- {{ hlocData.hloc[hlocData.hloc.length - 1].close | currency: currency.market.rsymbol }} - {{ hlocData.hloc[hlocData.hloc.length - 1].close | number: '1.' + currency.market.rprecision + '-' + currency.market.rprecision }} {{ currency.market.rsymbol }} -
- -
-
- - - - - - - -
-
- -
- -
-
- -
- -
- -
- - -
- - -
- - -

- - -

Latest Trades

- - - - - - - -
- - - -
-

- Buy Offers - Sell Offers -

-
- - - - - - - - - - - - - -
Price
- {{ offer.price | currency: market.rsymbol }} - {{ offer.price | number: '1.2-' + market.rprecision }} {{ market.rsymbol }} - - {{ offer.amount | currency: market.rsymbol }} - {{ offer.amount | number: '1.2-' + market.lprecision }} {{ market.lsymbol }} - - {{ offer.volume | currency: market.rsymbol }} - {{ offer.volume | number: '1.2-' + market.rprecision }} {{ market.rsymbol }} -
-
-
- - - -
-
-
- -
- - -Amount ({{ i }}) diff --git a/frontend/src/app/bisq/bisq-market/bisq-market.component.scss b/frontend/src/app/bisq/bisq-market/bisq-market.component.scss deleted file mode 100644 index 232405ff4..000000000 --- a/frontend/src/app/bisq/bisq-market/bisq-market.component.scss +++ /dev/null @@ -1,46 +0,0 @@ -.priceheader { - font-size: 24px; - @media(min-width: 576px){ - float: left; - } -} - -.radio-form { - @media(min-width: 576px){ - float: right; - } -} - -.loadingChart { - z-index: 100; - position: absolute; - top: 50%; - left: 50%; -} - -#graphHolder { - height: 550px; - overflow: hidden; -} - -.col { - &:last-child{ - margin-top: 50px; - @media(min-width: 576px){ - margin-top: 0px; - } - } -} - -.table-container { - overflow: scroll; - -ms-overflow-style: none; - scrollbar-width: none; - font-size: 13px; - @media(min-width: 576px){ - font-size: 16px; - } - &::-webkit-scrollbar { - display: none; - } -} diff --git a/frontend/src/app/bisq/bisq-market/bisq-market.component.ts b/frontend/src/app/bisq/bisq-market/bisq-market.component.ts deleted file mode 100644 index f81b4d891..000000000 --- a/frontend/src/app/bisq/bisq-market/bisq-market.component.ts +++ /dev/null @@ -1,159 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; -import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; -import { ActivatedRoute, Router } from '@angular/router'; -import { combineLatest, merge, Observable, of } from 'rxjs'; -import { map, switchMap } from 'rxjs/operators'; -import { SeoService } from '../../services/seo.service'; -import { WebsocketService } from '../../services/websocket.service'; -import { BisqApiService } from '../bisq-api.service'; -import { OffersMarket, Trade } from '../bisq.interfaces'; - -@Component({ - selector: 'app-bisq-market', - templateUrl: './bisq-market.component.html', - styleUrls: ['./bisq-market.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class BisqMarketComponent implements OnInit, OnDestroy { - hlocData$: Observable; - currency$: Observable; - offers$: Observable; - trades$: Observable; - radioGroupForm: UntypedFormGroup; - defaultInterval = 'day'; - - isLoadingGraph = false; - - constructor( - private websocketService: WebsocketService, - private route: ActivatedRoute, - private bisqApiService: BisqApiService, - private formBuilder: UntypedFormBuilder, - private seoService: SeoService, - private router: Router, - ) { } - - ngOnInit(): void { - this.radioGroupForm = this.formBuilder.group({ - interval: [this.defaultInterval], - }); - - if (['half_hour', 'hour', 'half_day', 'day', 'week', 'month', 'year', 'auto'].indexOf(this.route.snapshot.fragment) > -1) { - this.radioGroupForm.controls.interval.setValue(this.route.snapshot.fragment, { emitEvent: false }); - } - - this.currency$ = this.bisqApiService.getMarkets$() - .pipe( - switchMap((markets) => combineLatest([of(markets), this.route.paramMap])), - map(([markets, routeParams]) => { - const pair = routeParams.get('pair'); - const pairUpperCase = pair.replace('_', '/').toUpperCase(); - this.seoService.setTitle($localize`:@@meta.title.bisq.market:Bisq market: ${pairUpperCase}`); - this.seoService.setDescription($localize`:@@meta.description.bisq.market:See price history, current buy/sell offers, and latest trades for the ${pairUpperCase} market on Bisq.`); - - return { - pair: pairUpperCase, - market: markets[pair], - }; - }) - ); - - this.trades$ = this.route.paramMap - .pipe( - map(routeParams => routeParams.get('pair')), - switchMap((marketPair) => this.bisqApiService.getMarketTrades$(marketPair)), - ); - - this.offers$ = this.route.paramMap - .pipe( - map(routeParams => routeParams.get('pair')), - switchMap((marketPair) => this.bisqApiService.getMarketOffers$(marketPair)), - map((offers) => offers[Object.keys(offers)[0]]) - ); - - this.hlocData$ = combineLatest([ - this.route.paramMap, - merge(this.radioGroupForm.get('interval').valueChanges, of(this.radioGroupForm.get('interval').value)), - ]) - .pipe( - switchMap(([routeParams, interval]) => { - this.isLoadingGraph = true; - const pair = routeParams.get('pair'); - return this.bisqApiService.getMarketsHloc$(pair, interval); - }), - map((hlocData) => { - this.isLoadingGraph = false; - - hlocData = hlocData.map((h) => { - h.time = h.period_start; - return h; - }); - - const hlocVolume = hlocData.map((h) => { - return { - time: h.time, - value: h.volume_right, - color: h.close > h.avg ? 'rgba(0, 41, 74, 0.7)' : 'rgba(0, 41, 74, 1)', - }; - }); - - // Add whitespace - if (hlocData.length > 1) { - const newHloc = []; - newHloc.push(hlocData[0]); - - const period = this.getUnixTimestampFromInterval(this.radioGroupForm.get('interval').value); // temp - let periods = 0; - const startingDate = hlocData[0].period_start; - let index = 1; - while (true) { - periods++; - if (hlocData[index].period_start > startingDate + period * periods) { - newHloc.push({ - time: startingDate + period * periods, - }); - } else { - newHloc.push(hlocData[index]); - index++; - if (!hlocData[index]) { - break; - } - } - } - hlocData = newHloc; - } - - return { - hloc: hlocData, - volume: hlocVolume, - }; - }), - ); - } - - setFragment(fragment: string) { - this.router.navigate([], { - relativeTo: this.route, - queryParamsHandling: 'merge', - fragment: fragment - }); - } - - ngOnDestroy(): void { - this.websocketService.stopTrackingBisqMarket(); - } - - getUnixTimestampFromInterval(interval: string): number { - switch (interval) { - case 'minute': return 60; - case 'half_hour': return 1800; - case 'hour': return 3600; - case 'half_day': return 43200; - case 'day': return 86400; - case 'week': return 604800; - case 'month': return 2592000; - case 'year': return 31579200; - } - } - -} diff --git a/frontend/src/app/bisq/bisq-stats/bisq-stats.component.html b/frontend/src/app/bisq/bisq-stats/bisq-stats.component.html deleted file mode 100644 index 765d24f9f..000000000 --- a/frontend/src/app/bisq/bisq-stats/bisq-stats.component.html +++ /dev/null @@ -1,86 +0,0 @@ -
-

BSQ statistics

-
- -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Existing amount{{ (stats.minted - stats.burnt) | number: '1.2-2' }} BSQ
Minted amount{{ stats.minted | number: '1.2-2' }} BSQ
Burnt amount{{ stats.burnt | number: '1.2-2' }} BSQ
Addresses{{ stats.addresses | number }}
Unspent TXOs{{ stats.unspent_txos | number }}
Spent TXOs{{ stats.spent_txos | number }}
Price
Market cap
- -
-
-
-
- - - - - Existing amount - - - - Minted amount - - - - Burnt amount - - - - Addresses - - - - Unspent TXOs - - - - Spent TXOs - - - - Price - - - - Market cap - - - - diff --git a/frontend/src/app/bisq/bisq-stats/bisq-stats.component.scss b/frontend/src/app/bisq/bisq-stats/bisq-stats.component.scss deleted file mode 100644 index 69cf8224e..000000000 --- a/frontend/src/app/bisq/bisq-stats/bisq-stats.component.scss +++ /dev/null @@ -1,18 +0,0 @@ -.td-width { - width: 250px; -} - -@media (max-width: 767.98px) { - .td-width { - width: 175px; - } -} - -.fiat { - display: block; - font-size: 13px; - @media (min-width: 768px) { - font-size: 14px; - display: inline-block; - } -} \ No newline at end of file diff --git a/frontend/src/app/bisq/bisq-stats/bisq-stats.component.ts b/frontend/src/app/bisq/bisq-stats/bisq-stats.component.ts deleted file mode 100644 index 58819d9cf..000000000 --- a/frontend/src/app/bisq/bisq-stats/bisq-stats.component.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { BisqApiService } from '../bisq-api.service'; -import { BisqStats } from '../bisq.interfaces'; -import { SeoService } from '../../services/seo.service'; -import { StateService } from '../../services/state.service'; -import { WebsocketService } from '../../services/websocket.service'; - -@Component({ - selector: 'app-bisq-stats', - templateUrl: './bisq-stats.component.html', - styleUrls: ['./bisq-stats.component.scss'] -}) -export class BisqStatsComponent implements OnInit { - isLoading = true; - stats: BisqStats; - price: number; - - constructor( - private websocketService: WebsocketService, - private bisqApiService: BisqApiService, - private seoService: SeoService, - private stateService: StateService, - ) { } - - ngOnInit() { - this.websocketService.want(['blocks']); - - this.seoService.setTitle($localize`:@@2a30a4cdb123a03facc5ab8c5b3e6d8b8dbbc3d4:BSQ statistics`); - this.seoService.setDescription($localize`:@@meta.description.bisq.stats:See high-level stats on the BSQ economy: supply metrics, number of addresses, BSQ price, market cap, and more.`); - this.stateService.bsqPrice$ - .subscribe((bsqPrice) => { - this.price = bsqPrice; - }); - - this.bisqApiService.getStats$() - .subscribe((stats) => { - this.isLoading = false; - this.stats = stats; - }); - } - -} diff --git a/frontend/src/app/bisq/bisq-trades/bisq-trades.component.html b/frontend/src/app/bisq/bisq-trades/bisq-trades.component.html deleted file mode 100644 index d64fc1ac5..000000000 --- a/frontend/src/app/bisq/bisq-trades/bisq-trades.component.html +++ /dev/null @@ -1,46 +0,0 @@ -
- - - - - - - - - - - - - - - - - - - - - -
DatePrice - - Amount -
- ‎{{ trade.trade_date | date:'yyyy-MM-dd HH:mm' }} - - {{ trade.price | currency: (trade._market || market).rsymbol }} - {{ trade.price | number: '1.2-' + (trade._market || market).rprecision }} {{ (trade._market || market).rsymbol }} - - {{ trade.amount | currency: (trade._market || market).rsymbol }} - {{ trade.amount | number: '1.2-' + (trade._market || market).lprecision }} {{ (trade._market || market).lsymbol }} - - {{ trade.volume | currency: (trade._market || market).rsymbol }} - {{ trade.volume | number: '1.2-' + (trade._market || market).rprecision }} {{ (trade._market || market).rsymbol }} -
-
- - - - - - - -Amount ({{ i }}) diff --git a/frontend/src/app/bisq/bisq-trades/bisq-trades.component.scss b/frontend/src/app/bisq/bisq-trades/bisq-trades.component.scss deleted file mode 100644 index a7c82834d..000000000 --- a/frontend/src/app/bisq/bisq-trades/bisq-trades.component.scss +++ /dev/null @@ -1,38 +0,0 @@ - -.table-container { - overflow: scroll; - scrollbar-width: none; - font-size: 13px; - &::-webkit-scrollbar { - display: none; - } - @media(min-width: 576px){ - font-size: 16px; - } - thead th{ - text-align: right; - &:first-child{ - text-align: left; - } - &:nth-child(2) { - display: none; - @media(min-width: 1100px){ - display: table-cell; - } - } - } - tr { - td { - text-align: right; - &:first-child{ - text-align: left; - } - &:nth-child(2) { - display: none; - @media(min-width: 1100px){ - display: table-cell; - } - } - } - } -} diff --git a/frontend/src/app/bisq/bisq-trades/bisq-trades.component.ts b/frontend/src/app/bisq/bisq-trades/bisq-trades.component.ts deleted file mode 100644 index b984e715c..000000000 --- a/frontend/src/app/bisq/bisq-trades/bisq-trades.component.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { ChangeDetectionStrategy, Component, Input, OnChanges, OnInit } from '@angular/core'; -import { Observable } from 'rxjs'; - -@Component({ - selector: 'app-bisq-trades', - templateUrl: './bisq-trades.component.html', - styleUrls: ['./bisq-trades.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class BisqTradesComponent implements OnChanges { - @Input() trades$: Observable; - @Input() market: any; - @Input() view: 'all' | 'small' = 'all'; - - loadingColumns = [1, 2, 3, 4]; - - ngOnChanges() { - if (this.view === 'small') { - this.loadingColumns = [1, 2, 3]; - } - } -} diff --git a/frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html b/frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html deleted file mode 100644 index a4033dcda..000000000 --- a/frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html +++ /dev/null @@ -1,36 +0,0 @@ -
-
-
- - - - - - - - - - - - - - - -
Inputs{{ totalInput / 100 | number: '1.2-2' }} BSQ
Outputs{{ totalOutput / 100 | number: '1.2-2' }} BSQ
Issued amount{{ totalIssued / 100 | number: '1.2-2' }} BSQ
-
-
- - - - - - - - - - - -
Type {{ tx.txTypeDisplayString }}
Version{{ tx.txVersion }}
-
-
-
\ No newline at end of file diff --git a/frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.scss b/frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.scss deleted file mode 100644 index f73dfea53..000000000 --- a/frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.scss +++ /dev/null @@ -1,22 +0,0 @@ -@media (max-width: 767.98px) { - .td-width { - width: 150px; - } - .mobile-even tr:nth-of-type(even) { - background-color: #181b2d; - } - .mobile-even tr:nth-of-type(odd) { - background-color: inherit; - } -} - -.table { - tr td { - &:last-child{ - text-align: right; - @media(min-width: 768px){ - text-align: left; - } - } - } -} \ No newline at end of file diff --git a/frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.ts b/frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.ts deleted file mode 100644 index 9728372c3..000000000 --- a/frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { Component, ChangeDetectionStrategy, Input, OnChanges } from '@angular/core'; -import { BisqTransaction } from '../../bisq/bisq.interfaces'; - -@Component({ - selector: 'app-bisq-transaction-details', - templateUrl: './bisq-transaction-details.component.html', - styleUrls: ['./bisq-transaction-details.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class BisqTransactionDetailsComponent implements OnChanges { - @Input() tx: BisqTransaction; - - totalInput: number; - totalOutput: number; - totalIssued: number; - - constructor() { } - - ngOnChanges() { - this.totalInput = this.tx.inputs.filter((input) => input.isVerified).reduce((acc, input) => acc + input.bsqAmount, 0); - this.totalOutput = this.tx.outputs.filter((output) => output.isVerified).reduce((acc, output) => acc + output.bsqAmount, 0); - this.totalIssued = this.tx.outputs - .filter((output) => output.isVerified && output.txOutputType === 'ISSUANCE_CANDIDATE_OUTPUT') - .reduce((acc, output) => acc + output.bsqAmount, 0); - } -} diff --git a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html deleted file mode 100644 index 85abafee0..000000000 --- a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html +++ /dev/null @@ -1,216 +0,0 @@ -
- - -
-
-

Transaction

-
- - - - - - - - - -
-
- -
-
-
- -
- -
-
-
- - - - - - - - - - - - - - - -
Timestamp - ‎{{ bisqTx.time | date:'yyyy-MM-dd HH:mm' }} -
- () -
-
Included in block - {{ bisqTx.blockHeight }} -
Features - - - - -
-
-
- - - - - - - - - - - - - - -
Burnt amount - {{ bisqTx.burntFee / 100 | number: '1.2-2' }} BSQ -
Fee per vByteFee per weight unit - -   - -
-
- -
-
- -
- -
-

Details

-
- - - -
- -
-

Inputs & Outputs

-
- - - -
- - - - -
- -
-
-

Transaction

-
-
- -
-
-
- - - - - - - - - - - - - - - -
-
-
- - - - - - - - - - - -
-
-
-
- -
- -
-

Details

-
- -
- - - - - - - - - - - - - - -
-
- -
- -
-

Inputs & Outputs

-
- -
-
-
- - - - - - -
-
-
- - - - - - -
-
-
-
- - - - -
- -
- Error loading Bisq transaction -

- {{ error.status }}: {{ error.statusText }} -
- - -
diff --git a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts deleted file mode 100644 index 7e3456464..000000000 --- a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts +++ /dev/null @@ -1,130 +0,0 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; -import { ActivatedRoute, ParamMap, Router } from '@angular/router'; -import { BisqTransaction } from '../../bisq/bisq.interfaces'; -import { switchMap, map, catchError } from 'rxjs/operators'; -import { of, Observable, Subscription } from 'rxjs'; -import { StateService } from '../../services/state.service'; -import { Block, Transaction } from '../../interfaces/electrs.interface'; -import { BisqApiService } from '../bisq-api.service'; -import { SeoService } from '../../services/seo.service'; -import { ElectrsApiService } from '../../services/electrs-api.service'; -import { HttpErrorResponse } from '@angular/common/http'; -import { WebsocketService } from '../../services/websocket.service'; - -@Component({ - selector: 'app-bisq-transaction', - templateUrl: './bisq-transaction.component.html', - styleUrls: ['./../../components/transaction/transaction.component.scss'] -}) -export class BisqTransactionComponent implements OnInit, OnDestroy { - bisqTx: BisqTransaction; - tx: Transaction; - latestBlock$: Observable; - txId: string; - price: number; - isLoading = true; - isLoadingTx = true; - error = null; - subscription: Subscription; - - constructor( - private websocketService: WebsocketService, - private route: ActivatedRoute, - private bisqApiService: BisqApiService, - private electrsApiService: ElectrsApiService, - private stateService: StateService, - private seoService: SeoService, - private router: Router, - ) { } - - ngOnInit(): void { - this.websocketService.want(['blocks']); - - this.subscription = this.route.paramMap.pipe( - switchMap((params: ParamMap) => { - this.isLoading = true; - this.isLoadingTx = true; - this.error = null; - document.body.scrollTo(0, 0); - this.txId = params.get('id') || ''; - this.seoService.setTitle($localize`:@@bisq.transaction.browser-title:Transaction: ${this.txId}:INTERPOLATION:`); - this.seoService.setDescription($localize`:@@meta.description.bisq.transaction:See inputs, outputs, transaction type, burnt amount, and more for transaction with txid ${this.txId}:INTERPOLATION:.`); - if (history.state.data) { - return of(history.state.data); - } - return this.bisqApiService.getTransaction$(this.txId) - .pipe( - catchError((bisqTxError: HttpErrorResponse) => { - if (bisqTxError.status === 404) { - return this.electrsApiService.getTransaction$(this.txId) - .pipe( - map((tx) => { - if (tx.status.confirmed) { - this.error = { - status: 200, - statusText: 'Transaction is confirmed but not available in the Bisq database, please try reloading this page.' - }; - return null; - } - return tx; - }), - catchError((txError: HttpErrorResponse) => { - console.log(txError); - this.error = txError; - this.seoService.logSoft404(); - return of(null); - }) - ); - } - this.error = bisqTxError; - this.seoService.logSoft404(); - return of(null); - }) - ); - }), - switchMap((tx) => { - if (!tx) { - return of(null); - } - - if (tx.version) { - if (this.stateService.env.BASE_MODULE === 'bisq') { - window.location.replace('https://mempool.space/tx/' + this.txId); - } else { - this.router.navigate(['/tx/', this.txId], { state: { data: tx, bsqTx: true }}); - } - return of(null); - } - - this.bisqTx = tx; - this.isLoading = false; - - return this.electrsApiService.getTransaction$(this.txId); - }), - ) - .subscribe((tx) => { - this.isLoadingTx = false; - - if (!tx) { - this.seoService.logSoft404(); - return; - } - - this.tx = tx; - }, - (error) => { - this.error = error; - }); - - this.latestBlock$ = this.stateService.blocks$.pipe(map((blocks) => blocks[0])); - - this.stateService.bsqPrice$ - .subscribe((bsqPrice) => { - this.price = bsqPrice; - }); - } - - ngOnDestroy() { - this.subscription.unsubscribe(); - } -} diff --git a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html deleted file mode 100644 index bc22414ca..000000000 --- a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html +++ /dev/null @@ -1,56 +0,0 @@ -
-

BSQ Transactions

- -
-
- -
-
- -
- -
- - - - - - - - - - - - - - - - - - - - -
TXIDTypeAmountConfirmedHeight
{{ tx.id | slice : 0 : 8 }} - - {{ getStringByTxType(tx.txType) }} - - - - {{ tx.burntFee / 100 | number: '1.2-2' }} BSQ - - - {{ calculateTotalOutput(tx.outputs) / 100 | number: '1.2-2' }} BSQ - - {{ tx.blockHeight }}
- -
- - - -
- - - - - - diff --git a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.scss b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.scss deleted file mode 100644 index a42d55e5e..000000000 --- a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.scss +++ /dev/null @@ -1,23 +0,0 @@ -label { - padding: 0.25rem 1rem; - white-space: nowrap; -} - -:host ::ng-deep .dropdown-menu { - right: 0px; - left: inherit; -} - -.pagination-container { - float: none; - @media(min-width: 400px){ - float: right; - } -} - -.container-xl { - padding-bottom: 60px; - @media(min-width: 400px){ - padding-bottom: 100px; - } -} \ No newline at end of file diff --git a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts deleted file mode 100644 index be5455639..000000000 --- a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts +++ /dev/null @@ -1,166 +0,0 @@ -import { Component, OnInit, ChangeDetectionStrategy, ChangeDetectorRef, OnDestroy } from '@angular/core'; -import { BisqTransaction, BisqOutput } from '../bisq.interfaces'; - -import { Observable, Subscription } from 'rxjs'; -import { switchMap, map, tap } from 'rxjs/operators'; -import { BisqApiService } from '../bisq-api.service'; -import { SeoService } from '../../services/seo.service'; -import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms'; -import { Router, ActivatedRoute } from '@angular/router'; -import { IMultiSelectOption, IMultiSelectSettings, IMultiSelectTexts } from '../../components/ngx-bootstrap-multiselect/types' -import { WebsocketService } from '../../services/websocket.service'; - -@Component({ - selector: 'app-bisq-transactions', - templateUrl: './bisq-transactions.component.html', - styleUrls: ['./bisq-transactions.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class BisqTransactionsComponent implements OnInit, OnDestroy { - transactions$: Observable<[BisqTransaction[], number]>; - page = 1; - itemsPerPage = 50; - fiveItemsPxSize = 250; - isLoading = true; - loadingItems: number[]; - radioGroupForm: UntypedFormGroup; - types: string[] = []; - radioGroupSubscription: Subscription; - - txTypeOptions: IMultiSelectOption[] = [ - { id: 1, name: $localize`Asset listing fee` }, - { id: 2, name: $localize`Blind vote` }, - { id: 3, name: $localize`Compensation request` }, - { id: 4, name: $localize`Genesis` }, - { id: 13, name: $localize`Irregular` }, - { id: 5, name: $localize`Lockup` }, - { id: 6, name: $localize`Pay trade fee` }, - { id: 7, name: $localize`Proof of burn` }, - { id: 8, name: $localize`Proposal` }, - { id: 9, name: $localize`Reimbursement request` }, - { id: 10, name: $localize`Transfer BSQ` }, - { id: 11, name: $localize`Unlock` }, - { id: 12, name: $localize`Vote reveal` }, - ]; - txTypesDefaultChecked = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]; - - txTypeDropdownSettings: IMultiSelectSettings = { - buttonClasses: 'btn btn-primary btn-sm', - displayAllSelectedText: true, - showCheckAll: true, - showUncheckAll: true, - maxHeight: '500px', - fixedTitle: true, - }; - - txTypeDropdownTexts: IMultiSelectTexts = { - defaultTitle: $localize`:@@bisq-transactions.filter:Filter`, - checkAll: $localize`:@@bisq-transactions.selectall:Select all`, - uncheckAll: $localize`:@@bisq-transactions.unselectall:Unselect all`, - }; - - // @ts-ignore - paginationSize: 'sm' | 'lg' = 'md'; - paginationMaxSize = 5; - - txTypes = ['ASSET_LISTING_FEE', 'BLIND_VOTE', 'COMPENSATION_REQUEST', 'GENESIS', 'LOCKUP', 'PAY_TRADE_FEE', - 'PROOF_OF_BURN', 'PROPOSAL', 'REIMBURSEMENT_REQUEST', 'TRANSFER_BSQ', 'UNLOCK', 'VOTE_REVEAL', 'IRREGULAR']; - - constructor( - private websocketService: WebsocketService, - private bisqApiService: BisqApiService, - private seoService: SeoService, - private formBuilder: UntypedFormBuilder, - private route: ActivatedRoute, - private router: Router, - private cd: ChangeDetectorRef, - ) { } - - ngOnInit(): void { - this.websocketService.want(['blocks']); - this.seoService.setTitle($localize`:@@add4cd82e3e38a3110fe67b3c7df56e9602644ee:Transactions`); - this.seoService.setDescription($localize`:@@meta.description.bisq.transactions:See recent BSQ transactions: amount, txid, associated Bitcoin block, transaction type, and more.`); - - this.radioGroupForm = this.formBuilder.group({ - txTypes: [this.txTypesDefaultChecked], - }); - - this.loadingItems = Array(this.itemsPerPage); - - if (document.body.clientWidth < 670) { - this.paginationSize = 'sm'; - this.paginationMaxSize = 3; - } - - this.transactions$ = this.route.queryParams - .pipe( - tap((queryParams) => { - if (queryParams.page) { - const newPage = parseInt(queryParams.page, 10); - this.page = newPage; - } else { - this.page = 1; - } - if (queryParams.types) { - const types = queryParams.types.split(',').map((str: string) => parseInt(str, 10)); - this.types = types.map((id: number) => this.txTypes[id - 1]); - this.radioGroupForm.get('txTypes').setValue(types, { emitEvent: false }); - } else { - this.types = []; - this.radioGroupForm.get('txTypes').setValue([], { emitEvent: false }); - } - this.cd.markForCheck(); - }), - switchMap(() => this.bisqApiService.listTransactions$((this.page - 1) * this.itemsPerPage, this.itemsPerPage, this.types)), - map((response) => [response.body, parseInt(response.headers.get('x-total-count'), 10)]) - ); - - this.radioGroupSubscription = this.radioGroupForm.valueChanges - .subscribe((data) => { - this.types = data.txTypes.map((id: number) => this.txTypes[id - 1]); - if (this.types.length === this.txTypes.length) { - this.types = []; - } - this.page = 1; - this.typesChanged(data.txTypes); - this.cd.markForCheck(); - }); - } - - pageChange(page: number) { - this.router.navigate([], { - relativeTo: this.route, - queryParams: { page: page }, - queryParamsHandling: 'merge', - }); - } - - typesChanged(types: number[]) { - this.router.navigate([], { - relativeTo: this.route, - queryParams: { types: types.join(','), page: 1 }, - queryParamsHandling: 'merge', - }); - } - - calculateTotalOutput(outputs: BisqOutput[]): number { - return outputs.reduce((acc: number, output: BisqOutput) => acc + output.bsqAmount, 0); - } - - getStringByTxType(type: string) { - const id = this.txTypes.indexOf(type) + 1; - return this.txTypeOptions.find((type) => id === type.id).name; - } - - trackByFn(index: number) { - return index; - } - - onResize(event: any) { - this.paginationMaxSize = event.target.innerWidth < 670 ? 3 : 5; - } - - ngOnDestroy(): void { - this.radioGroupSubscription.unsubscribe(); - } -} diff --git a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html b/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html deleted file mode 100644 index dc4993e90..000000000 --- a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html +++ /dev/null @@ -1,83 +0,0 @@ -
-
-
- - - - - - - - - - -
- - - - - - - - - - - - - B{{ input.address | shortenString : 16 }} - B{{ input.address | shortenString : 35 }} - - - -
-
-
-
- - - - - - - - - - -
- - B{{ output.address | shortenString : 16 }} - B{{ output.address | shortenString : 35 }} - - - - - - - - - - - - -
-
-
- -
-
- Burnt amount: {{ tx.burntFee / 100 | number: '1.2-2' }} BSQ -
- -
- - -   - - -
-
-
- -
\ No newline at end of file diff --git a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.scss b/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.scss deleted file mode 100644 index bffd646d8..000000000 --- a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.scss +++ /dev/null @@ -1,103 +0,0 @@ - -.arrow-td { - width: 20px; -} -.green, .grey, .red { - font-size: 16px; - top: -2px; - position: relative; - @media( min-width: 576px){ - font-size: 19px; - } -} - -.green { - color:#28a745; -} - -.red { - color:#dc3545; -} - -.grey { - color:#6c757d; -} - -@media (max-width: 767.98px) { - .mobile-bottomcol { - margin-top: 15px; - } - .details-table td:first-child { - white-space: pre-wrap; - } -} - - -.details-table { - margin-top: 5px; -} - -.details-table td { - padding: 0.75rem; -} - -.details-table td:nth-child(2) { - word-break: break-all; - white-space: normal; - font-family: "Courier New", Courier, monospace; - font-size: 12px; -} - -.smaller-text { - font-size: 12px; - @media (min-width: 576px) { - font-size: 14px !important; - } -} - -.longer { - max-width: 100% !important; - width: 200px; - display: inline-block; -} - -.row{ - flex-direction: column; - @media (min-width: 992px) { - flex-direction: row; - } -} - -.extra-info { - display: inline-table; - .fiat { - font-size: 14px; - display: block; - text-align: right; - } -} - -.transaction-fee { - display: block; - margin: 0px auto 5px; - @media (min-width: 576px) { - display: inline-table; - } -} - - -.fiat { - margin-left: 10px; - font-size: 13px; - @media (min-width: 576px) { - font-size: 14px; - } -} - -.btn-container { - text-align: right; - @media (min-width: 576px) { - display: inline-table; - float: right; - } -} \ No newline at end of file diff --git a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.ts b/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.ts deleted file mode 100644 index a46cbf07f..000000000 --- a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { Component, OnInit, ChangeDetectionStrategy, Input, OnChanges } from '@angular/core'; -import { BisqTransaction } from '../../bisq/bisq.interfaces'; -import { StateService } from '../../services/state.service'; -import { map } from 'rxjs/operators'; -import { Observable } from 'rxjs'; -import { Block } from '../../interfaces/electrs.interface'; - -@Component({ - selector: 'app-bisq-transfers', - templateUrl: './bisq-transfers.component.html', - styleUrls: ['./bisq-transfers.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class BisqTransfersComponent implements OnInit, OnChanges { - @Input() tx: BisqTransaction; - @Input() showConfirmations = false; - - totalOutput: number; - latestBlock$: Observable; - - constructor( - private stateService: StateService, - ) { } - - trackByIndexFn(index: number) { - return index; - } - - ngOnInit() { - this.latestBlock$ = this.stateService.blocks$.pipe(map((blocks) => blocks[0])); - } - - ngOnChanges() { - this.totalOutput = this.tx.outputs.filter((output) => output.isVerified).reduce((acc, output) => acc + output.bsqAmount, 0); - } - - switchCurrency() { - const oldvalue = !this.stateService.viewFiat$.value; - this.stateService.viewFiat$.next(oldvalue); - } - -} diff --git a/frontend/src/app/bisq/bisq.interfaces.ts b/frontend/src/app/bisq/bisq.interfaces.ts deleted file mode 100644 index fb04667eb..000000000 --- a/frontend/src/app/bisq/bisq.interfaces.ts +++ /dev/null @@ -1,261 +0,0 @@ - -export interface BisqBlocks { - chainHeight: number; - blocks: BisqBlock[]; -} - -export interface BisqBlock { - height: number; - time: number; - hash: string; - previousBlockHash: string; - txs: BisqTransaction[]; -} - -export interface BisqTransaction { - txVersion: string; - id: string; - blockHeight: number; - blockHash: string; - time: number; - inputs: BisqInput[]; - outputs: BisqOutput[]; - txType: string; - txTypeDisplayString: string; - burntFee: number; - invalidatedBsq: number; - unlockBlockHeight: number; -} - -interface BisqInput { - spendingTxOutputIndex: number; - spendingTxId: string; - bsqAmount: number; - isVerified: boolean; - address: string; - time: number; -} - -export interface BisqOutput { - txVersion: string; - txId: string; - index: number; - bsqAmount: number; - btcAmount: number; - height: number; - isVerified: boolean; - burntFee: number; - invalidatedBsq: number; - address: string; - scriptPubKey: BisqScriptPubKey; - spentInfo?: SpentInfo; - time: any; - txType: string; - txTypeDisplayString: string; - txOutputType: string; - txOutputTypeDisplayString: string; - lockTime: number; - isUnspent: boolean; - opReturn?: string; -} - -export interface BisqStats { - minted: number; - burnt: number; - addresses: number; - unspent_txos: number; - spent_txos: number; -} - -interface BisqScriptPubKey { - addresses: string[]; - asm: string; - hex: string; - reqSigs?: number; - type: string; -} - -interface SpentInfo { - height: number; - inputIndex: number; - txId: string; -} - - -export interface BisqTrade { - direction: string; - price: string; - amount: string; - volume: string; - payment_method: string; - trade_id: string; - trade_date: number; - market?: string; -} - -export interface Currencies { [txid: string]: Currency; } - -export interface Currency { - code: string; - name: string; - precision: number; - - _type: string; -} - -export interface Depth { [market: string]: Market; } - -interface Market { - 'buys': string[]; - 'sells': string[]; -} - -export interface HighLowOpenClose { - period_start: number | string; - open: string; - high: string; - low: string; - close: string; - volume_left: string; - volume_right: string; - avg: string; -} - -export interface Markets { [txid: string]: Pair; } - -interface Pair { - pair: string; - lname: string; - rname: string; - lsymbol: string; - rsymbol: string; - lprecision: number; - rprecision: number; - ltype: string; - rtype: string; - name: string; -} - -export interface Offers { [market: string]: OffersMarket; } - -export interface OffersMarket { - buys: Offer[] | null; - sells: Offer[] | null; -} - -export interface OffersData { - direction: string; - currencyCode: string; - minAmount: number; - amount: number; - price: number; - date: number; - useMarketBasedPrice: boolean; - marketPriceMargin: number; - paymentMethod: string; - id: string; - currencyPair: string; - primaryMarketDirection: string; - priceDisplayString: string; - primaryMarketAmountDisplayString: string; - primaryMarketMinAmountDisplayString: string; - primaryMarketVolumeDisplayString: string; - primaryMarketMinVolumeDisplayString: string; - primaryMarketPrice: number; - primaryMarketAmount: number; - primaryMarketMinAmount: number; - primaryMarketVolume: number; - primaryMarketMinVolume: number; -} - -export interface Offer { - offer_id: string; - offer_date: number; - direction: string; - min_amount: string; - amount: string; - price: string; - volume: string; - payment_method: string; - offer_fee_txid: any; -} - -export interface Tickers { [market: string]: Ticker | null; } - -export interface Ticker { - last: string; - high: string; - low: string; - volume_left: string; - volume_right: string; - buy: string | null; - sell: string | null; -} - -export interface Trade { - market?: string; - price: string; - amount: string; - volume: string; - payment_method: string; - trade_id: string; - trade_date: number; - _market: Pair; -} - -export interface TradesData { - currency: string; - direction: string; - tradePrice: number; - tradeAmount: number; - tradeDate: number; - paymentMethod: string; - offerDate: number; - useMarketBasedPrice: boolean; - marketPriceMargin: number; - offerAmount: number; - offerMinAmount: number; - offerId: string; - depositTxId?: string; - currencyPair: string; - primaryMarketDirection: string; - primaryMarketTradePrice: number; - primaryMarketTradeAmount: number; - primaryMarketTradeVolume: number; - - _market: string; - _tradePriceStr: string; - _tradeAmountStr: string; - _tradeVolumeStr: string; - _offerAmountStr: string; - _tradePrice: number; - _tradeAmount: number; - _tradeVolume: number; - _offerAmount: number; -} - -export interface MarketVolume { - period_start: number; - num_trades: number; - volume: string; -} - -export interface MarketsApiError { - success: number; - error: string; -} - -export type Interval = 'minute' | 'half_hour' | 'hour' | 'half_day' | 'day' | 'week' | 'month' | 'year' | 'auto'; - -export interface SummarizedIntervals { [market: string]: SummarizedInterval; } -export interface SummarizedInterval { - period_start: number; - open: number; - close: number; - high: number; - low: number; - avg: number; - volume_right: number; - volume_left: number; - time?: number; -} diff --git a/frontend/src/app/bisq/bisq.module.ts b/frontend/src/app/bisq/bisq.module.ts deleted file mode 100644 index f7f71156b..000000000 --- a/frontend/src/app/bisq/bisq.module.ts +++ /dev/null @@ -1,84 +0,0 @@ -import { NgModule } from '@angular/core'; -import { BisqRoutingModule } from './bisq.routing.module'; -import { SharedModule } from '../shared/shared.module'; - -import { LightweightChartsComponent } from './lightweight-charts/lightweight-charts.component'; -import { LightweightChartsAreaComponent } from './lightweight-charts-area/lightweight-charts-area.component'; -import { BisqMarketComponent } from './bisq-market/bisq-market.component'; -import { BisqTransactionsComponent } from './bisq-transactions/bisq-transactions.component'; -import { BisqTransactionComponent } from './bisq-transaction/bisq-transaction.component'; -import { BisqBlockComponent } from './bisq-block/bisq-block.component'; -import { BisqDashboardComponent } from './bisq-dashboard/bisq-dashboard.component'; -import { BisqMainDashboardComponent } from './bisq-main-dashboard/bisq-main-dashboard.component'; -import { BisqIconComponent } from './bisq-icon/bisq-icon.component'; -import { BisqTransactionDetailsComponent } from './bisq-transaction-details/bisq-transaction-details.component'; -import { BisqTransfersComponent } from './bisq-transfers/bisq-transfers.component'; -import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome'; -import { faLeaf, faQuestion, faExclamationTriangle, faRocket, faRetweet, faFileAlt, faMoneyBill, - faEye, faEyeSlash, faLock, faLockOpen, faExclamationCircle } from '@fortawesome/free-solid-svg-icons'; -import { BisqBlocksComponent } from './bisq-blocks/bisq-blocks.component'; -import { BisqApiService } from './bisq-api.service'; -import { BisqAddressComponent } from './bisq-address/bisq-address.component'; -import { BisqStatsComponent } from './bisq-stats/bisq-stats.component'; -import { BsqAmountComponent } from './bsq-amount/bsq-amount.component'; -import { BisqTradesComponent } from './bisq-trades/bisq-trades.component'; -import { CommonModule } from '@angular/common'; -import { AutofocusDirective } from '../components/ngx-bootstrap-multiselect/autofocus.directive'; -import { MultiSelectSearchFilter } from '../components/ngx-bootstrap-multiselect/search-filter.pipe'; -import { OffClickDirective } from '../components/ngx-bootstrap-multiselect/off-click.directive'; -import { NgxDropdownMultiselectComponent } from '../components/ngx-bootstrap-multiselect/ngx-bootstrap-multiselect.component'; -import { BisqMasterPageComponent } from '../components/bisq-master-page/bisq-master-page.component'; - -@NgModule({ - declarations: [ - BisqMasterPageComponent, - BisqTransactionsComponent, - BisqTransactionComponent, - BisqBlockComponent, - BisqTransactionComponent, - BisqIconComponent, - BisqTransactionDetailsComponent, - BisqTransfersComponent, - BisqBlocksComponent, - BisqAddressComponent, - BisqStatsComponent, - BsqAmountComponent, - LightweightChartsComponent, - LightweightChartsAreaComponent, - BisqDashboardComponent, - BisqMarketComponent, - BisqTradesComponent, - BisqMainDashboardComponent, - NgxDropdownMultiselectComponent, - AutofocusDirective, - OffClickDirective, - ], - imports: [ - CommonModule, - BisqRoutingModule, - SharedModule, - FontAwesomeModule, - ], - providers: [ - BisqApiService, - MultiSelectSearchFilter, - AutofocusDirective, - OffClickDirective, - ] -}) -export class BisqModule { - constructor(library: FaIconLibrary) { - library.addIcons(faQuestion); - library.addIcons(faExclamationCircle); - library.addIcons(faExclamationTriangle); - library.addIcons(faRocket); - library.addIcons(faRetweet); - library.addIcons(faLeaf); - library.addIcons(faFileAlt); - library.addIcons(faMoneyBill); - library.addIcons(faEye); - library.addIcons(faEyeSlash); - library.addIcons(faLock); - library.addIcons(faLockOpen); - } -} diff --git a/frontend/src/app/bisq/bisq.routing.module.ts b/frontend/src/app/bisq/bisq.routing.module.ts deleted file mode 100644 index 7c6d2ee1b..000000000 --- a/frontend/src/app/bisq/bisq.routing.module.ts +++ /dev/null @@ -1,95 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { BisqMasterPageComponent } from '../components/bisq-master-page/bisq-master-page.component'; -import { BisqTransactionsComponent } from './bisq-transactions/bisq-transactions.component'; -import { BisqTransactionComponent } from './bisq-transaction/bisq-transaction.component'; -import { BisqBlockComponent } from './bisq-block/bisq-block.component'; -import { BisqBlocksComponent } from './bisq-blocks/bisq-blocks.component'; -import { BisqAddressComponent } from './bisq-address/bisq-address.component'; -import { BisqStatsComponent } from './bisq-stats/bisq-stats.component'; -import { BisqDashboardComponent } from './bisq-dashboard/bisq-dashboard.component'; -import { BisqMarketComponent } from './bisq-market/bisq-market.component'; -import { BisqMainDashboardComponent } from './bisq-main-dashboard/bisq-main-dashboard.component'; -import { PushTransactionComponent } from '../components/push-transaction/push-transaction.component'; - -const routes: Routes = [ - { - path: '', - component: BisqMasterPageComponent, - children: [ - { - path: '', - component: BisqMainDashboardComponent, - }, - { - path: 'markets', - data: { networks: ['bisq'] }, - component: BisqDashboardComponent, - }, - { - path: 'transactions', - data: { networks: ['bisq'] }, - component: BisqTransactionsComponent - }, - { - path: 'market/:pair', - data: { networkSpecific: true }, - component: BisqMarketComponent, - }, - { - path: 'tx/push', - component: PushTransactionComponent, - }, - { - path: 'tx/:id', - data: { networkSpecific: true }, - component: BisqTransactionComponent - }, - { - path: 'blocks', - children: [], - component: BisqBlocksComponent - }, - { - path: 'block/:id', - data: { networkSpecific: true }, - component: BisqBlockComponent, - }, - { - path: 'address/:id', - data: { networkSpecific: true }, - component: BisqAddressComponent, - }, - { - path: 'stats', - data: { networks: ['bisq'] }, - component: BisqStatsComponent, - }, - { - path: 'about', - loadChildren: () => import('../components/about/about.module').then(m => m.AboutModule), - }, - { - path: 'docs', - loadChildren: () => import('../docs/docs.module').then(m => m.DocsModule) - }, - { - path: 'api', - loadChildren: () => import('../docs/docs.module').then(m => m.DocsModule) - }, - { - path: 'terms-of-service', - loadChildren: () => import('../components/terms-of-service/terms-of-service.module').then(m => m.TermsOfServiceModule), - }, - { - path: '**', - redirectTo: '' - } - ] - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], -}) -export class BisqRoutingModule { } diff --git a/frontend/src/app/bisq/bsq-amount/bsq-amount.component.html b/frontend/src/app/bisq/bsq-amount/bsq-amount.component.html deleted file mode 100644 index 654adcb47..000000000 --- a/frontend/src/app/bisq/bsq-amount/bsq-amount.component.html +++ /dev/null @@ -1,6 +0,0 @@ - - {{ conversions.USD * bsq / 100 * (bsqPrice$ | async) / 100000000 | currency:'USD':'symbol':'1.2-2' }} - - - {{ bsq / 100 | number : digitsInfo }} BSQ - diff --git a/frontend/src/app/bisq/bsq-amount/bsq-amount.component.scss b/frontend/src/app/bisq/bsq-amount/bsq-amount.component.scss deleted file mode 100644 index 843bd58b6..000000000 --- a/frontend/src/app/bisq/bsq-amount/bsq-amount.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -.green-color { - color: #3bcc49; -} diff --git a/frontend/src/app/bisq/bsq-amount/bsq-amount.component.ts b/frontend/src/app/bisq/bsq-amount/bsq-amount.component.ts deleted file mode 100644 index a3dd10e81..000000000 --- a/frontend/src/app/bisq/bsq-amount/bsq-amount.component.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Component, OnInit, ChangeDetectionStrategy, Input } from '@angular/core'; -import { StateService } from '../../services/state.service'; -import { Observable } from 'rxjs'; - -@Component({ - selector: 'app-bsq-amount', - templateUrl: './bsq-amount.component.html', - styleUrls: ['./bsq-amount.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class BsqAmountComponent implements OnInit { - conversions$: Observable; - viewFiat$: Observable; - bsqPrice$: Observable; - - @Input() bsq: number; - @Input() digitsInfo = '1.2-2'; - @Input() forceFiat = false; - @Input() green = false; - - constructor( - private stateService: StateService, - ) { } - - ngOnInit() { - this.viewFiat$ = this.stateService.viewFiat$.asObservable(); - this.conversions$ = this.stateService.conversions$.asObservable(); - this.bsqPrice$ = this.stateService.bsqPrice$; - } -} diff --git a/frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.scss b/frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.scss deleted file mode 100644 index 56fe6ab0e..000000000 --- a/frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.scss +++ /dev/null @@ -1,25 +0,0 @@ -:host ::ng-deep .floating-tooltip-2 { - width: 160px; - height: 80px; - position: absolute; - display: none; - padding: 8px; - box-sizing: border-box; - font-size: 12px; - color:rgba(255, 255, 255, 1); - background-color: #131722; - text-align: left; - z-index: 1000; - top: 12px; - left: 12px; - pointer-events: none; - border-radius: 2px; -} - -:host ::ng-deep .volumeText { - color: rgba(33, 150, 243, 0.7); -} - -:host ::ng-deep .tradesText { - color: rgba(37, 177, 53, 1); -} diff --git a/frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts b/frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts deleted file mode 100644 index 714d95eec..000000000 --- a/frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts +++ /dev/null @@ -1,151 +0,0 @@ -import { createChart, CrosshairMode, isBusinessDay } from 'lightweight-charts'; -import { ChangeDetectionStrategy, Component, ElementRef, HostListener, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; - -@Component({ - selector: 'app-lightweight-charts-area', - template: '', - styleUrls: ['./lightweight-charts-area.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class LightweightChartsAreaComponent implements OnInit, OnChanges, OnDestroy { - @Input() data: any; - @Input() lineData: any; - @Input() precision: number; - @Input() height = 500; - - areaSeries: any; - volumeSeries: any; - chart: any; - lineSeries: any; - container: any; - - width: number; - - constructor( - private element: ElementRef, - ) { } - - @HostListener('window:resize', ['$event']) - resizeCanvas(): void { - this.width = this.element.nativeElement.parentElement.offsetWidth; - this.chart.applyOptions({ - width: this.width, - height: this.height, - }); - } - - ngOnInit() { - this.width = this.element.nativeElement.parentElement.offsetWidth; - this.container = document.createElement('div'); - const chartholder = this.element.nativeElement.appendChild(this.container); - - this.chart = createChart(chartholder, { - width: this.width, - height: this.height, - crosshair: { - mode: CrosshairMode.Normal, - }, - layout: { - backgroundColor: '#000', - textColor: 'rgba(255, 255, 255, 0.8)', - }, - grid: { - vertLines: { - color: 'rgba(255, 255, 255, 0.1)', - }, - horzLines: { - color: 'rgba(255, 255, 255, 0.1)', - }, - }, - rightPriceScale: { - borderColor: 'rgba(255, 255, 255, 0.2)', - }, - timeScale: { - borderColor: 'rgba(255, 255, 255, 0.2)', - }, - }); - - this.lineSeries = this.chart.addLineSeries({ - color: 'rgba(37, 177, 53, 1)', - lineColor: 'rgba(216, 27, 96, 1)', - lineWidth: 2, - }); - - this.areaSeries = this.chart.addAreaSeries({ - topColor: 'rgba(33, 150, 243, 0.7)', - bottomColor: 'rgba(33, 150, 243, 0.1)', - lineColor: 'rgba(33, 150, 243, 0.1)', - lineWidth: 2, - }); - - const toolTip = document.createElement('div'); - toolTip.className = 'floating-tooltip-2'; - chartholder.appendChild(toolTip); - - this.chart.subscribeCrosshairMove((param) => { - if (!param.time || param.point.x < 0 || param.point.x > this.width || param.point.y < 0 || param.point.y > this.height) { - toolTip.style.display = 'none'; - return; - } - - const dateStr = isBusinessDay(param.time) - ? this.businessDayToString(param.time) - : new Date(param.time * 1000).toLocaleDateString(); - - toolTip.style.display = 'block'; - const price = param.seriesPrices.get(this.areaSeries); - const line = param.seriesPrices.get(this.lineSeries); - - const tradesText = $localize`:@@bisq-graph-trades:Trades`; - const volumeText = $localize`:@@bisq-graph-volume:Volume`; - - toolTip.innerHTML = ` - - -
${tradesText}:${Math.round(line * 100) / 100}
${volumeText}:${Math.round(price * 100) / 100} BTC
-
${dateStr}
`; - - const y = param.point.y; - - const toolTipWidth = 100; - const toolTipHeight = 80; - const toolTipMargin = 15; - - let left = param.point.x + toolTipMargin; - if (left > this.width - toolTipWidth) { - left = param.point.x - toolTipMargin - toolTipWidth; - } - - let top = y + toolTipMargin; - if (top > this.height - toolTipHeight) { - top = y - toolTipHeight - toolTipMargin; - } - - toolTip.style.left = left + 'px'; - toolTip.style.top = top + 'px'; - }); - - this.updateData(); - } - - businessDayToString(businessDay) { - return businessDay.year + '-' + businessDay.month + '-' + businessDay.day; - } - - ngOnChanges(changes: SimpleChanges) { - if (!changes.data || changes.data.isFirstChange()){ - return; - } - this.updateData(); - } - - updateData() { - this.areaSeries.setData(this.data); - this.lineSeries.setData(this.lineData); - } - - ngOnDestroy() { - this.chart.remove(); - } - -} diff --git a/frontend/src/app/bisq/lightweight-charts/lightweight-charts.component.scss b/frontend/src/app/bisq/lightweight-charts/lightweight-charts.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/frontend/src/app/bisq/lightweight-charts/lightweight-charts.component.ts b/frontend/src/app/bisq/lightweight-charts/lightweight-charts.component.ts deleted file mode 100644 index 620b61782..000000000 --- a/frontend/src/app/bisq/lightweight-charts/lightweight-charts.component.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { createChart, CrosshairMode } from 'lightweight-charts'; -import { ChangeDetectionStrategy, Component, ElementRef, HostListener, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; - -@Component({ - selector: 'app-lightweight-charts', - template: '', - styleUrls: ['./lightweight-charts.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class LightweightChartsComponent implements OnInit, OnChanges, OnDestroy { - @Input() data: any; - @Input() volumeData: any; - @Input() precision: number; - @Input() height = 500; - - lineSeries: any; - volumeSeries: any; - chart: any; - - constructor( - private element: ElementRef, - ) { } - - @HostListener('window:resize', ['$event']) - resizeCanvas(): void { - this.chart.applyOptions({ - width: this.element.nativeElement.parentElement.offsetWidth, - height: this.height, - }); - } - - ngOnInit() { - this.chart = createChart(this.element.nativeElement, { - width: this.element.nativeElement.parentElement.offsetWidth, - height: this.height, - layout: { - backgroundColor: '#000000', - textColor: '#d1d4dc', - }, - crosshair: { - mode: CrosshairMode.Normal, - }, - grid: { - vertLines: { - visible: true, - color: 'rgba(42, 46, 57, 0.5)', - }, - horzLines: { - color: 'rgba(42, 46, 57, 0.5)', - }, - }, - }); - this.lineSeries = this.chart.addCandlestickSeries(); - - this.volumeSeries = this.chart.addHistogramSeries({ - color: '#26a69a', - priceFormat: { - type: 'volume', - }, - priceScaleId: '', - scaleMargins: { - top: 0.85, - bottom: 0, - }, - }); - - this.updateData(); - } - - ngOnChanges(changes: SimpleChanges) { - if (!changes.data || changes.data.isFirstChange()){ - return; - } - this.updateData(); - } - - ngOnDestroy() { - this.chart.remove(); - } - - updateData() { - this.lineSeries.setData(this.data); - this.volumeSeries.setData(this.volumeData); - - this.lineSeries.applyOptions({ - priceFormat: { - type: 'price', - precision: this.precision, - minMove: 0.0000001, - }, - }); - } - -} diff --git a/frontend/src/app/components/app/app.component.ts b/frontend/src/app/components/app/app.component.ts index c7ca798ae..ace0122f0 100644 --- a/frontend/src/app/components/app/app.component.ts +++ b/frontend/src/app/components/app/app.component.ts @@ -55,8 +55,6 @@ export class AppComponent implements OnInit { let domain = 'mempool.space'; if (this.stateService.env.BASE_MODULE === 'liquid') { domain = 'liquid.network'; - } else if (this.stateService.env.BASE_MODULE === 'bisq') { - domain = 'bisq.markets'; } this.link.setAttribute('href', 'https://' + domain + this.location.path()); } diff --git a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.html b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.html deleted file mode 100644 index 19c5ab715..000000000 --- a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.html +++ /dev/null @@ -1,91 +0,0 @@ -
- -
- -
- -
- -
- - - -
diff --git a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.scss b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.scss deleted file mode 100644 index a7274c165..000000000 --- a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.scss +++ /dev/null @@ -1,172 +0,0 @@ -.sticky-header { - position: sticky; - position: -webkit-sticky; - top: 0; - width: 100%; - z-index: 100; -} - -li.nav-item.active { - background-color: #653b9c; -} - -fa-icon { - font-size: 1.66em; -} - -.navbar { - z-index: 100; - min-height: 64px; -} - -li.nav-item { - margin: auto 5px; - padding-left: 10px; - padding-right: 10px; -} - -@media (max-width: 992px) { - footer > .container-fluid { - padding-bottom: 35px; - } -} - -@media (min-width: 992px) { - .navbar { - padding: 0rem 2rem; - } - fa-icon { - font-size: 1.2em; - } - .dropdown-container { - margin-right: 16px; - } - li.nav-item { - margin: auto 0px; - padding: 10px; - } -} - -.navbar-nav { - background: #212121; - bottom: 0; - box-shadow: 0px 0px 15px 0px #000; - flex-direction: row; - left: 0; - justify-content: center; - position: fixed; - width: 100%; - @media (min-width: 992px) { - background: transparent; - box-shadow: none; - position: relative; - width: auto; - } - a { - font-size: 0.8em; - @media (min-width: 375px) { - font-size: 1em; - } - } -} - - -.navbar-collapse { - flex-basis: auto; - justify-content: flex-end; -} - -@media (min-width: 992px) { - .navbar-collapse { - justify-content: space-between; - } -} - -.navbar-brand { - width: 60%; -} - -@media (min-width: 576px) { - .navbar-brand { - width: 140px; - } -} - -nav { - box-shadow: 0px 0px 15px 0px #000; -} - -.connection-badge { - position: absolute; - top: 13px; - left: 0px; - width: 140px; -} - -.badge { - margin: 0 auto; - display: table; -} - -.mainnet.active { - background-color: #653b9c; -} - -.liquid.active { - background-color: #116761; -} - -.liquidtestnet.active { - background-color: #494a4a; -} - -.testnet.active { - background-color: #1d486f; -} - -.signet.active { - background-color: #6f1d5d; -} - -.dropdown-divider { - border-top: 1px solid #121420; -} - -.dropdown-toggle::after { - vertical-align: 0.1em; -} - -.dropdown-item { - display: flex; - align-items: center; -} - -@media (min-width: 992px) { - .search-form-container { - width: 100%; - max-width: 500px; - padding-left: 15px; - } -} -.navbar-dark .navbar-nav .nav-link { - color: #f1f1f1; -} - -.navbar-brand { - margin-right: 5px; -} - -.current-network-svg { - width: 20px; - height: 20px; - margin-right: 5px; -} - -:host-context(.rtl-layout) { - .current-network-svg { - width: 20px; - height: 20px; - margin-left: 5px; - margin-right: 0px; - } -} \ No newline at end of file diff --git a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.ts b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.ts deleted file mode 100644 index f849998b1..000000000 --- a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { Env, StateService } from '../../services/state.service'; -import { Observable } from 'rxjs'; -import { LanguageService } from '../../services/language.service'; -import { EnterpriseService } from '../../services/enterprise.service'; -import { NavigationService } from '../../services/navigation.service'; - -@Component({ - selector: 'app-bisq-master-page', - templateUrl: './bisq-master-page.component.html', - styleUrls: ['./bisq-master-page.component.scss'], -}) -export class BisqMasterPageComponent implements OnInit { - connectionState$: Observable; - navCollapsed = false; - env: Env; - isMobile = window.innerWidth <= 767.98; - urlLanguage: string; - networkPaths: { [network: string]: string }; - footerVisible = true; - - constructor( - private stateService: StateService, - private languageService: LanguageService, - private enterpriseService: EnterpriseService, - private navigationService: NavigationService, - ) { } - - ngOnInit() { - this.env = this.stateService.env; - this.connectionState$ = this.stateService.connectionState$; - this.urlLanguage = this.languageService.getLanguageForUrl(); - this.navigationService.subnetPaths.subscribe((paths) => { - this.networkPaths = paths; - if (paths.mainnet.indexOf('docs') > -1) { - this.footerVisible = false; - } else { - this.footerVisible = true; - } - }); - } - - collapse(): void { - this.navCollapsed = !this.navCollapsed; - } - - onResize(event: any) { - this.isMobile = window.innerWidth <= 767.98; - } -} diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts index 760e9261d..76e450796 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts @@ -64,7 +64,6 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy { gradientColors = { '': ['#9339f4', '#105fb0'], - bisq: ['#9339f4', '#105fb0'], liquid: ['#116761', '#183550'], 'liquidtestnet': ['#494a4a', '#272e46'], testnet: ['#1d486f', '#183550'], diff --git a/frontend/src/app/components/clock/clock.component.ts b/frontend/src/app/components/clock/clock.component.ts index f3f778e89..94ff3e810 100644 --- a/frontend/src/app/components/clock/clock.component.ts +++ b/frontend/src/app/components/clock/clock.component.ts @@ -33,7 +33,6 @@ export class ClockComponent implements OnInit { gradientColors = { '': ['#9339f4', '#105fb0'], - bisq: ['#9339f4', '#105fb0'], liquid: ['#116761', '#183550'], 'liquidtestnet': ['#494a4a', '#272e46'], testnet: ['#1d486f', '#183550'], diff --git a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html index dd07645bf..7dfe746e7 100644 --- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html +++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html @@ -44,7 +44,7 @@ -
+
@@ -53,7 +53,6 @@ Signet Testnet
Layer 2 Networks
- Bisq Liquid Liquid Testnet
diff --git a/frontend/src/app/components/master-page-preview/master-page-preview.component.html b/frontend/src/app/components/master-page-preview/master-page-preview.component.html index 17182624b..4c436607b 100644 --- a/frontend/src/app/components/master-page-preview/master-page-preview.component.html +++ b/frontend/src/app/components/master-page-preview/master-page-preview.component.html @@ -9,7 +9,6 @@
Signet Testnet - Bisq Mainnet Testnet Mainnet diff --git a/frontend/src/app/components/master-page-preview/preview-title.component.html b/frontend/src/app/components/master-page-preview/preview-title.component.html index 1aebda6c6..a6a9fe5b7 100644 --- a/frontend/src/app/components/master-page-preview/preview-title.component.html +++ b/frontend/src/app/components/master-page-preview/preview-title.component.html @@ -1,7 +1,6 @@

- Bisq Liquid Liquid Bitcoin diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index fd7319b01..4be038a6f 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -31,7 +31,7 @@ -
+
@@ -39,8 +39,7 @@ Mainnet Signet Testnet -
Layer 2 Networks
- Bisq +
Layer 2 Networks
Liquid Liquid Testnet
diff --git a/frontend/src/app/components/privacy-policy/privacy-policy.component.html b/frontend/src/app/components/privacy-policy/privacy-policy.component.html index d14b12bc3..1250af686 100644 --- a/frontend/src/app/components/privacy-policy/privacy-policy.component.html +++ b/frontend/src/app/components/privacy-policy/privacy-policy.component.html @@ -11,7 +11,7 @@
-

The mempool.space website, the liquid.network website, the bisq.markets website, their associated API services, and related network and server infrastructure (collectively, the "Website") are operated by Mempool Space K.K. in Japan ("Mempool", "We", or "Us") and self-hosted from AS142052.

+

The mempool.space website, the liquid.network website, their associated API services, and related network and server infrastructure (collectively, the "Website") are operated by Mempool Space K.K. in Japan ("Mempool", "We", or "Us") and self-hosted from AS142052.

This website and its API service (collectively, the "Website") are operated by a member of the Bitcoin community ("We" or "Us"). Mempool Space K.K. in Japan ("Mempool") has no affiliation with the operator of this Website, and does not sponsor or endorse the information provided herein.

diff --git a/frontend/src/app/components/search-form/search-form.component.ts b/frontend/src/app/components/search-form/search-form.component.ts index 3bbe5bccb..8f5e65f96 100644 --- a/frontend/src/app/components/search-form/search-form.component.ts +++ b/frontend/src/app/components/search-form/search-form.component.ts @@ -178,7 +178,7 @@ export class SearchFormComponent implements OnInit { const addressPrefixSearchResults = result[0]; const lightningResults = result[1]; - // Do not show date and timestamp results for liquid and bisq + // Do not show date and timestamp results for liquid const isNetworkBitcoin = this.network === '' || this.network === 'testnet' || this.network === 'signet'; const matchesBlockHeight = this.regexBlockheight.test(searchText) && parseInt(searchText) <= this.stateService.latestBlockHeight; @@ -186,16 +186,10 @@ export class SearchFormComponent implements OnInit { const matchesUnixTimestamp = this.regexUnixTimestamp.test(searchText) && parseInt(searchText) <= Math.floor(Date.now() / 1000) && isNetworkBitcoin; const matchesTxId = this.regexTransaction.test(searchText) && !this.regexBlockhash.test(searchText); const matchesBlockHash = this.regexBlockhash.test(searchText); - let matchesAddress = !matchesTxId && this.regexAddress.test(searchText); + const matchesAddress = !matchesTxId && this.regexAddress.test(searchText); const otherNetworks = findOtherNetworks(searchText, this.network as any || 'mainnet', this.env); const liquidAsset = this.assets ? (this.assets[searchText] || []) : []; - - // Add B prefix to addresses in Bisq network - if (!matchesAddress && this.network === 'bisq' && getRegex('address', 'mainnet').test(searchText)) { - searchText = 'B' + searchText; - matchesAddress = !matchesTxId && this.regexAddress.test(searchText); - } - + if (matchesDateTime && searchText.indexOf('/') !== -1) { searchText = searchText.replace(/\//g, '-'); } @@ -299,7 +293,7 @@ export class SearchFormComponent implements OnInit { navigate(url: string, searchText: string, extras?: any, swapNetwork?: string) { - if (needBaseModuleChange(this.env.BASE_MODULE as 'liquid' | 'bisq' | 'mempool', swapNetwork as Network)) { + if (needBaseModuleChange(this.env.BASE_MODULE as 'liquid' | 'mempool', swapNetwork as Network)) { window.location.href = getTargetUrl(swapNetwork as Network, searchText, this.env); } else { this.router.navigate([this.relativeUrlPipe.transform(url, swapNetwork), searchText], extras); diff --git a/frontend/src/app/components/svg-images/svg-images.component.html b/frontend/src/app/components/svg-images/svg-images.component.html index 11dfe1d79..3fe3f56c8 100644 --- a/frontend/src/app/components/svg-images/svg-images.component.html +++ b/frontend/src/app/components/svg-images/svg-images.component.html @@ -60,9 +60,6 @@ - - - diff --git a/frontend/src/app/components/terms-of-service/terms-of-service.component.html b/frontend/src/app/components/terms-of-service/terms-of-service.component.html index c03f509e9..922ce9434 100644 --- a/frontend/src/app/components/terms-of-service/terms-of-service.component.html +++ b/frontend/src/app/components/terms-of-service/terms-of-service.component.html @@ -11,7 +11,7 @@
-

The mempool.space website, the liquid.network website, the bisq.markets website, their associated API services, and related network and server infrastructure (collectively, the "Website") are operated by Mempool Space K.K. in Japan ("Mempool", "We", or "Us") and self-hosted from AS142052.

+

The mempool.space website, the liquid.network website, their associated API services, and related network and server infrastructure (collectively, the "Website") are operated by Mempool Space K.K. in Japan ("Mempool", "We", or "Us") and self-hosted from AS142052.

This website and its API service (collectively, the "Website") are operated by a member of the Bitcoin community ("We" or "Us"). Mempool Space K.K. in Japan ("Mempool") has no affiliation with the operator of this Website, and does not sponsor or endorse the information provided herein.

@@ -61,7 +61,7 @@

The mempool.space explorer is Bitcoin Only.

-

Unfortunately, the liquid.network and bisq.markets explorers cannot be considered Bitcoin Only, as they may display altcoins as part of their core network functionality. We do not endorse any altcoins and encourage you to stay Bitcoin Only. Please see bitcoin-only.com for more Bitcoin Only resources.

+

Unfortunately, the liquid.network explorer cannot be considered Bitcoin Only, as they may display altcoins as part of their core network functionality. We do not endorse any altcoins and encourage you to stay Bitcoin Only. Please see bitcoin-only.com for more Bitcoin Only resources.


diff --git a/frontend/src/app/components/tx-bowtie-graph/tx-bowtie-graph.component.ts b/frontend/src/app/components/tx-bowtie-graph/tx-bowtie-graph.component.ts index f59cd1a36..9bbca05dd 100644 --- a/frontend/src/app/components/tx-bowtie-graph/tx-bowtie-graph.component.ts +++ b/frontend/src/app/components/tx-bowtie-graph/tx-bowtie-graph.component.ts @@ -85,7 +85,6 @@ export class TxBowtieGraphComponent implements OnInit, OnChanges { gradientColors = { '': ['#9339f4', '#105fb0', '#9339f400'], - bisq: ['#9339f4', '#105fb0', '#9339f400'], // liquid: ['#116761', '#183550'], liquid: ['#09a197', '#0f62af', '#09a19700'], // 'liquidtestnet': ['#494a4a', '#272e46'], diff --git a/frontend/src/app/docs/api-docs/api-docs-data.ts b/frontend/src/app/docs/api-docs/api-docs-data.ts index e75254213..14dc43a64 100644 --- a/frontend/src/app/docs/api-docs/api-docs-data.ts +++ b/frontend/src/app/docs/api-docs/api-docs-data.ts @@ -9,8 +9,8 @@ const emptyCodeSample = { response: `` }; -const showJsExamplesDefault = { "": true, "testnet": true, "signet": true, "liquid": true, "liquidtestnet": false, "bisq": true }; -const showJsExamplesDefaultFalse = { "": false, "testnet": false, "signet": false, "liquid": false, "liquidtestnet": false, "bisq": false }; +const showJsExamplesDefault = { "": true, "testnet": true, "signet": true, "liquid": true, "liquidtestnet": false }; +const showJsExamplesDefaultFalse = { "": false, "testnet": false, "signet": false, "liquid": false, "liquidtestnet": false }; export const wsApiDocsData = { showJsExamples: showJsExamplesDefault, @@ -101,7 +101,6 @@ if __name__ == "__main__": codeSampleTestnet: emptyCodeSample, codeSampleSignet: emptyCodeSample, codeSampleLiquid: emptyCodeSample, - codeSampleBisq: emptyCodeSample, }; export const restApiDocsData = [ @@ -110,7 +109,7 @@ export const restApiDocsData = [ category: "general", fragment: "general", title: "General", - showConditions: bitcoinNetworks.concat(["bisq"]) + showConditions: bitcoinNetworks, }, { type: "endpoint", @@ -251,7 +250,6 @@ export const restApiDocsData = [ codeSampleSignet: emptyCodeSample, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -301,530 +299,6 @@ export const restApiDocsData = [ codeSampleSignet: emptyCodeSample, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, - } - } - }, - { - type: "endpoint", - category: "general", - httpRequestMethod: "GET", - fragment: "get-stats", - title: "GET Stats", - description: { - default: "Returns statistics about all Bisq transactions." - }, - urlString: "/stats", - showConditions: ["bisq"], - showJsExamples: showJsExamplesDefault, - codeExample: { - default: { - codeTemplate: { - commonJS: ` - const { %{0}: { statistics } } = mempoolJS(); - - const stats = await statistics.getStats(); - - document.getElementById("result").textContent = JSON.stringify(stats, undefined, 2); - `, - esModule: ` - const { %{0}: { statistics } } = mempoolJS(); - - const stats = await statistics.getStats(); - console.log(stats); - `, - curl: `/api/stats`, - }, - codeSampleMainnet: emptyCodeSample, - codeSampleTestnet: emptyCodeSample, - codeSampleSignet: emptyCodeSample, - codeSampleLiquid: emptyCodeSample, - codeSampleBisq: { - esModule: [], - commonJS: [], - curl: [], - response: `{ - addresses: 213825, - minted: 6148323.75, - burnt: 1830262.66, - spent_txos: 215705, - unspent_txos: 2572 -}` - }, - } - } - }, - { - type: "category", - category: "markets", - fragment: "markets", - title: "Markets", - showConditions: ["bisq"] - }, - { - type: "endpoint", - category: "markets", - httpRequestMethod: "GET", - fragment: "get-market-currencies", - title: "GET Market Currencies", - description: { - default: "Provides list of available currencies for a given base currency." - }, - urlString: "/currencies", - showConditions: ["bisq"], - showJsExamples: showJsExamplesDefault, - codeExample: { - default: { - codeTemplate: { - curl: `/api/currencies`, - commonJS: ` - const { %{0}: { markets } } = mempoolJS(); - - const currencies = await markets.getCurrencies(); - - document.getElementById("result").textContent = JSON.stringify(currencies, undefined, 2); - `, - esModule: ` - const { %{0}: { markets } } = mempoolJS(); - - const currencies = await markets.getCurrencies(); - console.log(currencies); - `, - }, - codeSampleMainnet: emptyCodeSample, - codeSampleTestnet: emptyCodeSample, - codeSampleSignet: emptyCodeSample, - codeSampleLiquid: emptyCodeSample, - codeSampleBisq: { - esModule: [], - commonJS: [], - curl: [], - response: `{ - BTC: { - code: 'BTC', - name: 'Bitcoin', - precision: 8, - _type: 'crypto' - } - ... -}`, - }, - } - } - }, - { - type: "endpoint", - category: "markets", - httpRequestMethod: "GET", - fragment: "get-market-depth", - title: "GET Market Depth", - description: { - default: "Provides list of open offer prices for a single market." - }, - urlString: "/depth?market=[:market]", - showConditions: ["bisq"], - showJsExamples: showJsExamplesDefault, - codeExample: { - default: { - codeTemplate: { - curl: `/api/depth?market=%{1}`, - commonJS: ` - const { %{0}: { markets } } = mempoolJS(); - - const market = "%{1}"; - - const depth = await markets.getDepth({ market }); - - document.getElementById("result").textContent = JSON.stringify(depth, undefined, 2); - `, - esModule: ` - const { %{0}: { markets } } = mempoolJS(); - - const market = "%{1}"; - - const depth = await markets.getDepth({ market }); - console.log(depth); - `, - }, - codeSampleMainnet: emptyCodeSample, - codeSampleTestnet: emptyCodeSample, - codeSampleSignet: emptyCodeSample, - codeSampleLiquid: emptyCodeSample, - codeSampleBisq: { - esModule: ['BTC_USD'], - commonJS: ['BTC_USD'], - curl: ['BTC_USD'], - response: `{ - btc_usd: { - buys: [ - '4.56941560', - ... - ], - sells: [ - '4.54668218', - ... - ] - } -}`, - }, - } - } - }, - { - type: "endpoint", - category: "markets", - httpRequestMethod: "GET", - fragment: "get-market-hloc", - title: "GET Market HLOC", - description: { - default: "Provides hi/low/open/close data for a given market. This can be used to generate a candlestick chart." - }, - urlString: "/hloc?market=[:market]", - showConditions: ["bisq"], - showJsExamples: showJsExamplesDefault, - codeExample: { - default: { - codeTemplate: { - curl: `/api/hloc?market=%{1}`, - commonJS: ` - const { %{0}: { markets } } = mempoolJS(); - - const market = "%{1}"; - - const hloc = await markets.getHloc({ market }); - - document.getElementById("result").textContent = JSON.stringify(hloc, undefined, 2); - `, - esModule: ` - const { %{0}: { markets } } = mempoolJS(); - - const market = "%{1}"; - - const hloc = await markets.getHloc({ market }); - console.log(hloc); - `, - }, - codeSampleMainnet: emptyCodeSample, - codeSampleTestnet: emptyCodeSample, - codeSampleSignet: emptyCodeSample, - codeSampleLiquid: emptyCodeSample, - codeSampleBisq: { - esModule: ['BTC_USD'], - commonJS: ['BTC_USD'], - curl: ['BTC_USD'], - response: `[ - { - period_start: 1609459200, - open: '30448.18510000', - close: '45717.81750000', - high: '77700.00000000', - low: '27500.00000000', - avg: '44613.01158471', - volume_right: '4923536.57150000', - volume_left: '110.36100000' - } - ... -]`, - }, - } - } - }, - { - type: "endpoint", - category: "markets", - httpRequestMethod: "GET", - fragment: "get-markets", - title: "GET Markets", - description: { - default: "Provides list of available markets." - }, - urlString: "/markets", - showConditions: ["bisq"], - showJsExamples: showJsExamplesDefault, - codeExample: { - default: { - codeTemplate: { - curl: `/api/markets`, - commonJS: ` - const { %{0}: { markets } } = mempoolJS(); - - const allMarkets = await markets.getMarkets(); - - document.getElementById("result").textContent = JSON.stringify(allMarkets, undefined, 2); - `, - esModule: ` - const { %{0}: { markets } } = mempoolJS(); - - const allMarkets = await markets.getMarkets(); - console.log(allMarkets); - `, - }, - codeSampleMainnet: emptyCodeSample, - codeSampleTestnet: emptyCodeSample, - codeSampleSignet: emptyCodeSample, - codeSampleLiquid: emptyCodeSample, - codeSampleBisq: { - esModule: ['BTC_USD'], - commonJS: ['BTC_USD'], - curl: ['BTC_USD'], - response: `{ - btc_brl: { - pair: 'btc_brl', - lname: 'Bitcoin', - rname: 'Brazilian Real', - lsymbol: 'BTC', - rsymbol: 'BRL', - lprecision: 8, - rprecision: 2, - ltype: 'crypto', - rtype: 'fiat', - name: 'Bitcoin/Brazilian Real' - }, - ... -}`, - }, - } - } - }, - { - type: "endpoint", - category: "markets", - httpRequestMethod: "GET", - fragment: "get-market-offers", - title: "GET Market Offers", - description: { - default: "Provides list of open offer details for a single market." - }, - urlString: "/offers?market=[:market]", - showConditions: ["bisq"], - showJsExamples: showJsExamplesDefault, - codeExample: { - default: { - codeTemplate: { - curl: `/api/offers?market=%{1}`, - commonJS: ` - const { %{0}: { markets } } = mempoolJS(); - - const market = "%{1}"; - - const offers = await markets.getOffers({ market }); - - document.getElementById("result").textContent = JSON.stringify(offers, undefined, 2); - `, - esModule: ` - const { %{0}: { markets } } = mempoolJS(); - - const market = "%{1}"; - - const offers = await markets.getOffers({ market }); - console.log(offers); - `, - }, - codeSampleMainnet: emptyCodeSample, - codeSampleTestnet: emptyCodeSample, - codeSampleSignet: emptyCodeSample, - codeSampleLiquid: emptyCodeSample, - codeSampleBisq: { - esModule: ['BTC_USD'], - commonJS: ['BTC_USD'], - curl: ['BTC_USD'], - response: `{ - btc_usd: { - buys: [ - { - offer_id: "ORHL1BE-0c193d04-be60-4657-ba42-cc172bb4ae5d-172", - offer_date: 1630207815462, - direction: "BUY", - min_amount: "0.00500000", - amount: "0.01500000", - price: "50030.24770000", - volume: "750.45370000", - payment_method: "AMAZON_GIFT_CARD", - offer_fee_txid: null - }, - ... - ], - sells: [ - { - offer_id: "nswiwkre-7676d5e6-e808-4c47-9c51-d5708e465ad5-172", - offer_date: 1630320354509, - direction: "SELL", - min_amount: "0.04170000", - amount: "0.04170000", - price: "49534.89880000", - volume: "2065.60520000", - payment_method: "CASH_DEPOSIT", - offer_fee_txid: null - }, - ... - ] - } -}`, - }, - } - } - }, - { - type: "endpoint", - category: "markets", - httpRequestMethod: "GET", - fragment: "get-market-ticker", - title: "GET Market Ticker", - description: { - default: "Provides 24-hour price ticker for single market or all markets." - }, - urlString: "/ticker?market=[:market]", - showConditions: ["bisq"], - showJsExamples: showJsExamplesDefault, - codeExample: { - default: { - codeTemplate: { - curl: `/api/ticker?market=%{1}`, - commonJS: ` - const { %{0}: { markets } } = mempoolJS(); - - const market = "%{1}"; - - const ticker = await markets.getTicker({ market }); - - document.getElementById("result").textContent = JSON.stringify(ticker, undefined, 2); - `, - esModule: ` - const { %{0}: { markets } } = mempoolJS(); - - const market = "%{1}"; - - const ticker = await markets.getTicker({ market }); - console.log(ticker); - `, - }, - codeSampleMainnet: emptyCodeSample, - codeSampleTestnet: emptyCodeSample, - codeSampleSignet: emptyCodeSample, - codeSampleLiquid: emptyCodeSample, - codeSampleBisq: { - esModule: ['BTC_USD'], - commonJS: ['BTC_USD'], - curl: ['BTC_USD'], - response: `{ - last: "53923.20570000", - high: "53923.20570000", - low: "48137.67410000", - volume_left: "0.27160000", - volume_right: "13593.92070000", - buy: "48118.52400000", - sell: "49555.63750000" -}`, - }, - } - } - }, - { - type: "endpoint", - category: "markets", - httpRequestMethod: "GET", - fragment: "get-market-trades", - title: "GET Market Trades", - description: { - default: "Provides list of completed trades for a single market." - }, - urlString: "/trades?market=[:market]&limit=[:limit]", - showConditions: ["bisq"], - showJsExamples: showJsExamplesDefault, - codeExample: { - default: { - codeTemplate: { - curl: `/api/trades?market=%{1}&limit=%{2}`, - commonJS: ` - const { %{0}: { markets } } = mempoolJS(); - - const market = "%{1}"; - - const trades = await markets.getTrades({ market, limit: %{2} }); - - document.getElementById("result").textContent = JSON.stringify(trades, undefined, 2); - `, - esModule: ` - const { %{0}: { markets } } = mempoolJS(); - - const market = "%{1}"; - - const trades = await markets.getTrades({ market, limit: %{2} }); - console.log(trades); - `, - }, - codeSampleMainnet: emptyCodeSample, - codeSampleTestnet: emptyCodeSample, - codeSampleSignet: emptyCodeSample, - codeSampleLiquid: emptyCodeSample, - codeSampleBisq: { - esModule: ['BTC_USD', '1'], - commonJS: ['BTC_USD', '1'], - curl: ['BTC_USD', '1'], - response: `[ - { - price: "53923.20570000", - amount: "0.00500000", - volume: "269.61600000", - payment_method: "CLEAR_X_CHANGE", - trade_date: 1630646161647 - } -]`, - }, - } - } - }, - { - type: "endpoint", - category: "markets", - httpRequestMethod: "GET", - fragment: "get-market-volumes", - title: "GET Market Volumes", - description: { - default: "Provides periodic volume data in terms of base currency for one or all markets." - }, - urlString: "/volumes?basecurrency=[:basecurrency]", - showConditions: ["bisq"], - showJsExamples: showJsExamplesDefault, - codeExample: { - default: { - codeTemplate: { - curl: `/api/volumes?markets=%{1}`, - commonJS: ` - const { %{0}: { markets } } = mempoolJS(); - - const market = "%{1}"; - - const volumes = await markets.getVolumes({ market }); - - document.getElementById("result").textContent = JSON.stringify(volumes, undefined, 2); - `, - esModule: ` - const { %{0}: { markets } } = mempoolJS(); - - const market = "%{1}"; - - const volumes = await markets.getVolumes({ market }); - console.log(volumes); - `, - }, - codeSampleMainnet: emptyCodeSample, - codeSampleTestnet: emptyCodeSample, - codeSampleSignet: emptyCodeSample, - codeSampleLiquid: emptyCodeSample, - codeSampleBisq: { - esModule: ['BTC_USD', 'BTC'], - commonJS: ['BTC_USD', 'BTC'], - curl: ['BTC_USD', 'BTC'], - response: `[ - { - period_start: 1451606400, - num_trades: 1923, - volume: "1095.22050000" - }, - ... -]`, - }, } } }, @@ -833,7 +307,7 @@ export const restApiDocsData = [ category: "addresses", fragment: "addresses", title: "Addresses", - showConditions: bitcoinNetworks.concat(liquidNetworks).concat(["bisq"]) + showConditions: bitcoinNetworks.concat(liquidNetworks) }, { type: "endpoint", @@ -845,7 +319,7 @@ export const restApiDocsData = [ default: "Returns details about an address. Available fields: address, chain_stats, and mempool_stats. chain_stats and mempool_stats each contain an object with tx_count, funded_txo_count, funded_txo_sum, spent_txo_count, and spent_txo_sum." }, urlString: "/address/:address", - showConditions: bitcoinNetworks.concat(liquidNetworks).concat(["bisq"]), + showConditions: bitcoinNetworks.concat(liquidNetworks), showJsExamples: showJsExamplesDefault, codeExample: { default: { @@ -969,28 +443,6 @@ export const restApiDocsData = [ } }` }, - codeSampleBisq: { - esModule: [`B1DgwRN92rdQ9xpEVCdXRfgeqGw9X4YtrZz`], - commonJS: [`B1DgwRN92rdQ9xpEVCdXRfgeqGw9X4YtrZz`], - curl: [`B1DgwRN92rdQ9xpEVCdXRfgeqGw9X4YtrZz`], - response: `[ - { - "txVersion": "1", - "id": "d6f0a6fd191ac907ff88fc51af91cae8d50e596a846952ffa0ad0cea84eedc9a", - "blockHeight": 679129, - "blockHash": "00000000000000000001328850b0482312325f7f4abd5457e45d37cad664675d", - "time": 1618369311000, - "inputs": [ ... ], - "outputs": [ ... ], - "txType": "PAY_TRADE_FEE", - "txTypeDisplayString": "Pay trade fee", - "burntFee": 6, - "invalidatedBsq": 0, - "unlockBlockHeight": 0 - }, - ... -]` - }, } } }, @@ -1144,7 +596,6 @@ export const restApiDocsData = [ ... ]` }, - codeSampleBisq: emptyCodeSample, } } }, @@ -1298,12 +749,6 @@ export const restApiDocsData = [ ... ]` }, - codeSampleBisq: { - esModule: [], - commonJS: [], - curl: [], - response: '' - }, } } }, @@ -1429,7 +874,6 @@ export const restApiDocsData = [ } ]` }, - codeSampleBisq: emptyCodeSample, } } }, @@ -1562,7 +1006,6 @@ export const restApiDocsData = [ } ]`, }, - codeSampleBisq: emptyCodeSample, } } }, @@ -1621,7 +1064,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -1729,7 +1171,6 @@ export const restApiDocsData = [ "ticker": "LCAD" }`, }, - codeSampleBisq: emptyCodeSample, } } }, @@ -1816,7 +1257,6 @@ export const restApiDocsData = [ ... ]`, }, - codeSampleBisq: emptyCodeSample, } } }, @@ -1867,7 +1307,6 @@ export const restApiDocsData = [ curl: [`05aa9f02a06da37f2a0a572c49ac381499a16a643ad7c70c51ac94560778c92e`], response: `1000`, }, - codeSampleBisq: emptyCodeSample, } } }, @@ -1951,7 +1390,7 @@ export const restApiDocsData = [ category: "blocks", fragment: "blocks", title: "Blocks", - showConditions: bitcoinNetworks.concat(liquidNetworks).concat(["bisq"]) + showConditions: bitcoinNetworks.concat(liquidNetworks) }, { type: "endpoint", @@ -1964,7 +1403,7 @@ export const restApiDocsData = [ liquid: "Returns details about a block. Available fields: id, height, version, timestamp, bits, nonce, merkle_root, tx_count, size, weight,proof, and previousblockhash." }, urlString: "/block/:hash", - showConditions: bitcoinNetworks.concat(liquidNetworks).concat(["bisq"]), + showConditions: bitcoinNetworks.concat(liquidNetworks), showJsExamples: showJsExamplesDefault, codeExample: { default: { @@ -2120,18 +1559,6 @@ export const restApiDocsData = [ ext: {...} }`, }, - codeSampleBisq: { - esModule: ['0000000000000000000b24f70ed27da8b282b050f38e20831923211a1f7266d5'], - commonJS: ['0000000000000000000b24f70ed27da8b282b050f38e20831923211a1f7266d5'], - curl: ['0000000000000000000b24f70ed27da8b282b050f38e20831923211a1f7266d5'], - response: `{ - height: 698746, - time: 1630621494000, - hash: "0000000000000000000b24f70ed27da8b282b050f38e20831923211a1f7266d5", - previousBlockHash: "000000000000000000039cd226a99c125ee3004e9d585b04e2ccceccddef7547", - txs: [] -}` - }, } } }, @@ -2197,7 +1624,6 @@ export const restApiDocsData = [ curl: [`8f7cb70f32e2069724212c986f34462fc40180eabf189b44486faf6989824f9a`], response: `000000a0263542a60466e252dbc301001f2f87cdd232106344209d6c252bbda572fd4527b4b9a8412c0ecaca405241beaa6779e74d505a481941a873be74b0b34511cce7d806d261515c020001220020e9e4117540f7f23b3edd7c2cad660a17fb33c7959b8c37cf61d92b189133929a96000000fbee9cea00d8efdc49cfbec328537e0d7032194de6ebf3cf42e5c05bb89a08b10003004730440220303a6fc365e016422bd5d714e403db237964c9e53c244310a4a03f432583290202206951e82c2ffa028f88d64d9bb4ec7789ced137046bb38a02816617b554efd42b012551210217e403ddb181872c32a0cd468c710040b2f53d8cac69f18dad07985ee37e9a7151ae`, }, - codeSampleBisq: emptyCodeSample, } } }, @@ -2260,7 +1686,6 @@ export const restApiDocsData = [ curl: [`150000`], response: `67d5eb1aee63c6c2058a088985503ff0626fd3f7f8022bdc74fab36a359164db`, }, - codeSampleBisq: emptyCodeSample, } } }, @@ -2315,7 +1740,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -2381,7 +1805,6 @@ export const restApiDocsData = [ curl: [`67d5eb1aee63c6c2058a088985503ff0626fd3f7f8022bdc74fab36a359164db`], response: '', }, - codeSampleBisq: emptyCodeSample, } } }, @@ -2467,7 +1890,6 @@ export const restApiDocsData = [ next_best: "2f24f3d94c006971b86fe2c9cdc92a7ed0aa7ec3b0643a836b8d8b5a54103bab" }`, }, - codeSampleBisq: emptyCodeSample, } } }, @@ -2481,7 +1903,7 @@ export const restApiDocsData = [ default: "Returns the height of the last block." }, urlString: "/blocks/tip/height", - showConditions: bitcoinNetworks.concat(liquidNetworks).concat(["bisq"]), + showConditions: bitcoinNetworks.concat(liquidNetworks), showJsExamples: showJsExamplesDefault, codeExample: { default: { @@ -2531,12 +1953,6 @@ export const restApiDocsData = [ curl: [''], response: `162495`, }, - codeSampleBisq: { - esModule: [''], - commonJS: [''], - curl: [''], - response: `698765` - }, } } }, @@ -2600,7 +2016,6 @@ export const restApiDocsData = [ curl: [''], response: `ff643a1e102b555103d8feb20b296ee5cf3b4a202fa284e5d6ce82945b738ae7`, }, - codeSampleBisq: emptyCodeSample, } } }, @@ -2666,7 +2081,6 @@ export const restApiDocsData = [ curl: ['b6b4aeefa220c6a17da116bda666e869b3146967d2479656448a8bce1e799b8f', '1'], response: `41493aa0eec8b6d359c2defc90e2fafb42fb5b8633456648553467a4d3a16c4a` }, - codeSampleBisq: emptyCodeSample, } } }, @@ -2761,7 +2175,6 @@ export const restApiDocsData = [ "fa6b8dda9037f8284a659627005ad32dbb81e22b102c1d3d8a9bab0893ce2ab7" ]` }, - codeSampleBisq: emptyCodeSample, } } }, @@ -2917,7 +2330,6 @@ export const restApiDocsData = [ ... ]` }, - codeSampleBisq: emptyCodeSample, } } }, @@ -3121,7 +2533,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -3334,7 +2745,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -3409,87 +2819,6 @@ export const restApiDocsData = [ mediantime: 1640871614 }, ... -]` - }, - codeSampleBisq: emptyCodeSample, - } - } - }, - { - type: "endpoint", - category: "blocks", - httpRequestMethod: "GET", - fragment: "get-blocks", - title: "GET Blocks", - description: { - default: "

Returns the past n blocks with BSQ transactions starting m blocks ago.

Assume a block height of 700,000. Query /blocks/0/10 for the past 10 blocks before 700,000 with BSQ transactions. Query /blocks/1000/10 for the past 10 blocks before 699,000 with BSQ transactions." - }, - urlString: "/blocks/:m/:n", - showConditions: ["bisq"], - showJsExamples: showJsExamplesDefault, - codeExample: { - default: { - codeTemplate: { - curl: `/api/blocks/%{1}/%{2}`, - commonJS: ` - const { %{0}: { blocks } } = mempoolJS(); - - const getBlocks = await blocks.getBlocks({ index: %{1}, length: %{2} }); - - document.getElementById("result").textContent = JSON.stringify(getBlocks, undefined, 2); - `, - esModule: ` - const { %{0}: { blocks } } = mempoolJS(); - - const getBlocks = await blocks.getBlocks({ index: %{1}, length: %{2} }); - console.log(getBlocks); - `, - }, - codeSampleMainnet: emptyCodeSample, - codeSampleTestnet: emptyCodeSample, - codeSampleSignet: emptyCodeSample, - codeSampleLiquid: emptyCodeSample, - codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: { - esModule: ['0', '5'], - commonJS: ['0', '5'], - curl: ['0', '5'], - response: `[ - { - "height": 739030, - "time": 1654203258000, - "hash": "000000000000000000036bc04416ddeec264cbb977a9cd9e454897acb547b601", - "previousBlockHash": "00000000000000000000f49261617b589d76e5e70529ea1d4c16f3e19ddcb8ef", - "txs": [ ... ], - }, - { - "height": 739029, - "time": 1654203236000, - "hash": "00000000000000000000f49261617b589d76e5e70529ea1d4c16f3e19ddcb8ef", - "previousBlockHash": "00000000000000000008dd87e9486cd0d71c5d84e452432bab33c2a0cbaa31ce", - "txs": [ ... ], - }, - { - "height": 739025, - "time": 1654199569000, - "hash": "000000000000000000021e9ce82dec208af75807f92a9b1d9dae91f2b4d40e24", - "previousBlockHash": "00000000000000000002db644c025a76464b466d25900402452b07213b30c40b", - "txs": [ ... ] - }, - { - "height": 739023, - "time": 1654198597000, - "hash": "0000000000000000000702ce10250a46bea4155ca7acb869f3ea92c1e3a68bc5", - "previousBlockHash": "00000000000000000002b3d6c1adc5676262ded84181982f88dbd357b9f9d1ec", - "txs": [ ... ] - }, - { - "height": 739020, - "time": 1654197263000, - "hash": "000000000000000000046eb46ad941028381d3534c35658f9c80de0641dbbb31", - "previousBlockHash": "000000000000000000073f1c49b4c4895f3fa6b866d1e21ab8b22f3f9318b42f", - "txs": [ ... ] - } ]` }, } @@ -3597,7 +2926,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -3690,7 +3018,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -3797,7 +3124,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -3918,7 +3244,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -4128,7 +3453,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -4248,7 +3572,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -4343,7 +3666,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -4404,7 +3726,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -4503,7 +3824,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -4597,7 +3917,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -4724,7 +4043,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -4868,7 +4186,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -4977,7 +4294,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -5035,7 +4351,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -5120,7 +4435,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -5269,7 +4583,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -5430,7 +4743,6 @@ export const restApiDocsData = [ } ]` }, - codeSampleBisq: emptyCodeSample, } } }, @@ -5524,7 +4836,6 @@ export const restApiDocsData = [ minimumFee: 0.1 }` }, - codeSampleBisq: emptyCodeSample, } } }, @@ -5635,7 +4946,6 @@ export const restApiDocsData = [ ] }` }, - codeSampleBisq: emptyCodeSample, } } }, @@ -5722,7 +5032,6 @@ export const restApiDocsData = [ "dfbe66e6e71e775c9529a822c14286de0ee1066c2760a53552615d05e17006f3" ]` }, - codeSampleBisq: emptyCodeSample, } } }, @@ -5829,7 +5138,6 @@ export const restApiDocsData = [ ... ]` }, - codeSampleBisq: emptyCodeSample, } } }, @@ -5960,7 +5268,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -6090,7 +5397,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -6099,7 +5405,7 @@ export const restApiDocsData = [ category: "transactions", fragment: "transactions", title: "Transactions", - showConditions: bitcoinNetworks.concat(liquidNetworks).concat(["bisq"]) + showConditions: bitcoinNetworks.concat(liquidNetworks) }, { type: "endpoint", @@ -6163,7 +5469,6 @@ export const restApiDocsData = [ curl: ['txid'], response: `` }, - codeSampleBisq: emptyCodeSample, } } }, @@ -6177,7 +5482,7 @@ export const restApiDocsData = [ default: "Returns details about a transaction. Available fields: txid, version, locktime, size, weight, fee, vin, vout, and status." }, urlString: "/tx/:txid", - showConditions: bitcoinNetworks.concat(liquidNetworks).concat(["bisq"]), + showConditions: bitcoinNetworks.concat(liquidNetworks), showJsExamples: showJsExamplesDefault, codeExample: { default: { @@ -6302,27 +5607,6 @@ export const restApiDocsData = [ block_hash: "05a51089255650a16c17b4b3f3977376bc7ebe90a35584578f12916c3eaba59e", block_time: 1642000444 } -}`, - }, - codeSampleBisq: { - esModule: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - commonJS: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - curl: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - response: `{ - txid: "98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e", - version: 1, - locktime: 0, - vin: [], - vout: [], - size: 402, - weight: 957, - fee: 2390, - status: { - confirmed: true, - block_height: 698788, - block_hash: "00000000000000000005bfe17b41395bed53565022e0c98965b15ec1d00b1f31", - block_time: 1630645738 - } }`, }, } @@ -6390,12 +5674,6 @@ export const restApiDocsData = [ curl: [`59dd7a0bce4f3310272ff352402291bc555f141149812d8f573f62e7fdc19cc4`], response: `020000000102fa567669f73a314138aa6dbe74e3935612895df273d20ccbbedbecd44a04d3ce0000000000fdffffff8412fed07b8316dd4304df90af6f20292d3b2950133711c0ee43eb94fe12cc4f0100000000fdffffff040b801035010192095b8d9316f28450e98a85c915994c3f80ecc493adf505d73e9609a51e48bc0f35e34f88c482654d659fa779dcbf0457dc71053f3edcf76bd3667f03821ffcc4fc4ae5c2668685fec678e4...`, }, - codeSampleBisq: { - esModule: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - commonJS: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - curl: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - response: `0100000000010222ae3642a9300262f6e730e8bfb7979b15852c8836f3835beef9cd58c464e5f70000000000ffffffff22ae3642a9300262f6e730e8bfb7979b15852c8836f3835beef9cd58c464e5f70200000000ffffffff03de0900000000000016001490f9ee145d7b1c9352b793350741da97f3e4d795aca80500000000001600144168859b4b74a09277969fb8152115aea9d33a159c960600000000001600146534b1859209d8ae8f1a8...`, - }, } }, }, @@ -6451,12 +5729,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: { - esModule: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - commonJS: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - curl: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - response: `04000020e05c5f176bdb7966b44388ca223bef6e548fb390a9f202000000000000000000f10d5017f8e98200ea6e9d9a90d48e8078a49f2ee1da2cae9f80f48a0badfdaaeaad3161a0fa0f174d163a5daa0400000c77d2b87749e72de52feacaab57134c40172ae247c9de1f8f180736a8ef64a024542ab6b22b2c1fc961eae3d7d7d6c5f...`, - }, } } }, @@ -6572,28 +5844,6 @@ export const restApiDocsData = [ "1dbe7041197b78f73c0d4a3810c47080c252bc928f041b787acaad3fa76ba7a0" ], pos: 1 -}`, - }, - codeSampleBisq: { - esModule: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - commonJS: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - curl: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - response: `{ - block_height: 698788, - merkle: [ - "455eb8942edf5444f0130194353185705e891fb328b47fd5c43c0f5260de8121", - "98d18cb3470a3ee27a1d083e8f7baf76eaed19b5c972af33a335acdb3374dc75", - "1bf53a838bef7d64c2f7207bdb054df7dcc58e335ba9bd43803d00a24b4aec1b", - "19033925798e6e09f385dd7b5afbd76136f910b21b75ca03a2692ee804e0860e", - "5b4bd0b3cbbd5b73ae36d00bd144ee8db0966ff1f78c4483a4a8d601dc0b2ded", - "485a0c2af1687efe5433d4621c5dd222f6c5d6d7d7e3ea61c91f2c2bb2b62a54", - "1af9cbc4539b66e44c9bd6d07c5720301ba4694088e06b7f5978686b7a94aa62", - "b7a27d5a849f30cdf82c19b3d84902a146a0723a0798e46f91028f412af0d14d", - "b3925e68565674c54b3f0beb9f5f3820f4cd35cd15683b119cd232f52024a997", - "24a064efa83607188f1fdec947e22a17404c1357abcaea2fe52de74977b8d277", - "bd818bb2791a0d536097163c0d4dfb4dc3657cbd169617ca286dcc828ddf444d" - ], - pos: 546 }`, }, } @@ -6715,22 +5965,6 @@ export const restApiDocsData = [ block_hash: "3b10cdce761c4a2ec3e1239648c7d034922b34608a66f894e2f707307dae6b18", block_time: 1642002136 } -}`, - }, - codeSampleBisq: { - esModule: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`, '1'], - commonJS: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`, '1'], - curl: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`, '1'], - response: `{ - spent: true, - txid: "455eb8942edf5444f0130194353185705e891fb328b47fd5c43c0f5260de8121", - vin: 0, - status: { - confirmed: true, - block_height: 698788, - block_hash: "00000000000000000005bfe17b41395bed53565022e0c98965b15ec1d00b1f31", - block_time: 1630645738 - } }`, }, } @@ -6867,30 +6101,6 @@ export const restApiDocsData = [ { spent: false } -]`, - }, - codeSampleBisq: { - esModule: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - commonJS: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - curl: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - response: `[ - { - spent: false - }, - { - spent: true, - txid: "455eb8942edf5444f0130194353185705e891fb328b47fd5c43c0f5260de8121", - vin: 0, - status: { - confirmed: true, - block_height: 698788, - block_hash: "00000000000000000005bfe17b41395bed53565022e0c98965b15ec1d00b1f31", - block_time: 1630645738 - } - }, - { - spent: false - } ]`, }, } @@ -6958,12 +6168,6 @@ export const restApiDocsData = [ curl: ['59dd7a0bce4f3310272ff352402291bc555f141149812d8f573f62e7fdc19cc4'], response: ``, }, - codeSampleBisq: { - esModule: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - commonJS: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - curl: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - response: ``, - }, } } }, @@ -7105,7 +6309,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -7191,17 +6394,6 @@ export const restApiDocsData = [ block_height: 168765, block_hash: "05a51089255650a16c17b4b3f3977376bc7ebe90a35584578f12916c3eaba59e", block_time: 1642000444 -}`, - }, - codeSampleBisq: { - esModule: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - commonJS: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - curl: [`98a598aeea121ea061dc713d1547363358974191c257d3b563bbf2a1706ff44e`], - response: `{ - confirmed: true, - block_height: 698788, - block_hash: "00000000000000000005bfe17b41395bed53565022e0c98965b15ec1d00b1f31", - block_time: 1630645738 }`, }, } @@ -7249,64 +6441,6 @@ export const restApiDocsData = [ } } }, - { - type: "endpoint", - category: "transactions", - httpRequestMethod: "GET", - fragment: "get-transactions", - title: "GET Transactions", - description: { - default: "Returns :length of latest Bisq transactions, starting from :index." - }, - urlString: "/txs/:index/:length", - showConditions: ["bisq"], - showJsExamples: showJsExamplesDefault, - codeExample: { - default: { - codeTemplate: { - curl: `/api/txs/%{1}/%{2}`, - commonJS: ` - const { %{0}: { transactions } } = mempoolJS(); - - const txs = await transactions.getTxs({ index: %{1}, length: %{2} }); - - document.getElementById("result").textContent = JSON.stringify(txs, undefined, 2); - `, - esModule: ` - const { %{0}: { transactions } } = mempoolJS(); - - const txs = await transactions.getTxs({ index: %{1}, length: %{2} }); - console.log(txStatus); - `, - }, - codeSampleMainnet: emptyCodeSample, - codeSampleTestnet: emptyCodeSample, - codeSampleSignet: emptyCodeSample, - codeSampleLiquid: emptyCodeSample, - codeSampleBisq: { - esModule: [`0`, '1'], - commonJS: [`0`, '1'], - curl: [`0`, '1'], - response: `[ - { - txVersion: "1", - id: "be1b2932155c012bec79bbd0f7cf7db32a4a35859dcb7b70f5d35fea581ac30a", - blockHeight: 698808, - blockHash: "0000000000000000000bf9461e8e0b8e077bcc0e8fe0f55483a7fd5d0860336c", - time: 1630658066000, - inputs: [], - outputs: [], - txType: "PAY_TRADE_FEE", - txTypeDisplayString: "Pay trade fee", - burntFee: 609, - invalidatedBsq: 0, - unlockBlockHeight: 0 - } -]`, - }, - } - } - }, { type: "endpoint", category: "transactions", @@ -7371,7 +6505,6 @@ export const restApiDocsData = [ curl: [`0200000001fd5b5fcd1cb066c27cfc9fda5428b9be850b81ac440ea51f1ddba2f987189ac1010000008a4730440220686a40e9d2dbffeab4ca1ff66341d06a17806767f12a1fc4f55740a7af24c6b5022049dd3c9a85ac6c51fecd5f4baff7782a518781bbdd94453c8383755e24ba755c01410436d554adf4a3eb03a317c77aa4020a7bba62999df633bba0ea8f83f48b9e01b0861d3b3c796840f982ee6b14c3c4b7ad04fcfcc3774f81bff9aaf52a15751fedfdffffff02416c00000000000017a914bc791b2afdfe1e1b5650864a9297b20d74c61f4787d71d0000000000001976a9140a59837ccd4df25adc31cdad39be6a8d97557ed688ac00000000`], response: ``, }, - codeSampleBisq: emptyCodeSample, } } }, @@ -7475,7 +6608,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -7561,7 +6693,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -7784,7 +6915,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -7929,7 +7059,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -8049,7 +7178,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -8162,7 +7290,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -8286,7 +7413,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -8484,7 +7610,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -8681,7 +7806,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -8869,7 +7993,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -9034,7 +8157,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -9133,7 +8255,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -9299,7 +8420,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -9501,7 +8621,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -9638,7 +8757,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -9747,7 +8865,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, @@ -9856,7 +8973,6 @@ export const restApiDocsData = [ }, codeSampleLiquid: emptyCodeSample, codeSampleLiquidTestnet: emptyCodeSample, - codeSampleBisq: emptyCodeSample, } } }, diff --git a/frontend/src/app/docs/api-docs/api-docs.component.html b/frontend/src/app/docs/api-docs/api-docs.component.html index 89165c90e..57f2fc442 100644 --- a/frontend/src/app/docs/api-docs/api-docs.component.html +++ b/frontend/src/app/docs/api-docs/api-docs.component.html @@ -108,7 +108,7 @@

-
+
diff --git a/frontend/src/app/docs/api-docs/api-docs.component.ts b/frontend/src/app/docs/api-docs/api-docs.component.ts index 3f5ce75e5..0f59524f7 100644 --- a/frontend/src/app/docs/api-docs/api-docs.component.ts +++ b/frontend/src/app/docs/api-docs/api-docs.component.ts @@ -183,10 +183,6 @@ export class ApiDocsComponent implements OnInit, AfterViewInit { if (network === 'liquidtestnet') { curlResponse = code.codeSampleLiquidTestnet.curl; } - if (network === 'bisq') { - curlResponse = code.codeSampleBisq.curl; - } - let curlNetwork = ''; if (this.env.BASE_MODULE === 'mempool') { if (!['', 'mainnet'].includes(network)) { diff --git a/frontend/src/app/docs/code-template/code-template.component.ts b/frontend/src/app/docs/code-template/code-template.component.ts index 6b91f5a9d..395f6a297 100644 --- a/frontend/src/app/docs/code-template/code-template.component.ts +++ b/frontend/src/app/docs/code-template/code-template.component.ts @@ -36,9 +36,6 @@ export class CodeTemplateComponent implements OnInit { npmGithubLink(){ let npmLink = `https://github.com/mempool/mempool.js`; - if (this.network === 'bisq') { - npmLink = `https://github.com/mempool/mempool.js/tree/main/npm-bisq-js`; - } if (this.network === 'liquid' || this.network === 'liquidtestnet') { npmLink = `https://github.com/mempool/mempool.js/tree/main/npm-liquid-js`; } @@ -47,9 +44,6 @@ export class CodeTemplateComponent implements OnInit { npmModuleLink() { let npmLink = `https://www.npmjs.org/package/@mempool/mempool.js`; - if (this.network === 'bisq') { - npmLink = `https://www.npmjs.org/package/@mempool/bisq.js`; - } if (this.network === 'liquid' || this.network === 'liquidtestnet') { npmLink = `https://www.npmjs.org/package/@mempool/liquid.js`; } @@ -58,12 +52,12 @@ export class CodeTemplateComponent implements OnInit { normalizeHostsESModule(codeText: string) { if (this.env.BASE_MODULE === 'mempool') { - if (['liquid', 'bisq'].includes(this.network)) { + if (['liquid'].includes(this.network)) { codeText = codeText.replace('%{0}', this.network); } else { codeText = codeText.replace('%{0}', 'bitcoin'); } - if(['', 'main', 'liquid', 'bisq', 'liquidtestnet'].includes(this.network)) { + if(['', 'main', 'liquid', 'liquidtestnet'].includes(this.network)) { codeText = codeText.replace('mempoolJS();', `mempoolJS({ hostname: '${document.location.hostname}' });`); @@ -75,11 +69,6 @@ export class CodeTemplateComponent implements OnInit { } } - if (this.env.BASE_MODULE === 'bisq') { - codeText = codeText.replace('} = mempoolJS();', ` = bisqJS();`); - codeText = codeText.replace('{ %{0}: ', ''); - } - if (this.env.BASE_MODULE === 'liquid') { codeText = codeText.replace('} = mempoolJS();', ` = liquidJS();`); codeText = codeText.replace('{ %{0}: ', ''); @@ -89,12 +78,12 @@ export class CodeTemplateComponent implements OnInit { normalizeHostsCommonJS(codeText: string) { if (this.env.BASE_MODULE === 'mempool') { - if (['liquid', 'bisq'].includes(this.network)) { + if (['liquid'].includes(this.network)) { codeText = codeText.replace('%{0}', this.network); } else { codeText = codeText.replace('%{0}', 'bitcoin'); } - if(['', 'main', 'liquid', 'bisq'].includes(this.network)) { + if(['', 'main', 'liquid'].includes(this.network)) { codeText = codeText.replace('mempoolJS();', `mempoolJS({ hostname: '${document.location.hostname}' });`); @@ -106,11 +95,6 @@ export class CodeTemplateComponent implements OnInit { } } - if (this.env.BASE_MODULE === 'bisq') { - codeText = codeText.replace('} = mempoolJS();', ` = bisqJS();`); - codeText = codeText.replace('{ %{0}: ', ''); - } - if (this.env.BASE_MODULE === 'liquid') { codeText = codeText.replace('} = mempoolJS();', ` = liquidJS();`); codeText = codeText.replace('{ %{0}: ', ''); @@ -135,14 +119,8 @@ export class CodeTemplateComponent implements OnInit { if (this.network === 'liquid' || this.network === 'liquidtestnet') { codeText = this.replaceJSPlaceholder(codeText, code.codeSampleLiquid.esModule); } - if (this.network === 'bisq') { - codeText = this.replaceJSPlaceholder(codeText, code.codeSampleBisq.esModule); - } let importText = `import mempoolJS from "@mempool/mempool.js";`; - if (this.env.BASE_MODULE === 'bisq') { - importText = `import bisqJS from "@mempool/bisq.js";`; - } if (this.env.BASE_MODULE === 'liquid') { importText = `import liquidJS from "@mempool/liquid.js";`; } @@ -174,18 +152,12 @@ init();`; if (this.network === 'liquid' || this.network === 'liquidtestnet') { codeText = this.replaceJSPlaceholder(codeText, code.codeSampleLiquid.esModule); } - if (this.network === 'bisq') { - codeText = this.replaceJSPlaceholder(codeText, code.codeSampleBisq.esModule); - } if (code.noWrap) { return codeText; } let importText = ``; - if (this.env.BASE_MODULE === 'bisq') { - importText = ``; - } if (this.env.BASE_MODULE === 'liquid') { importText = ``; } @@ -224,14 +196,6 @@ npm install @mempool/mempool.js --save # yarn yarn add @mempool/mempool.js`; - if (this.env.BASE_MODULE === 'bisq') { - importTemplate = `# npm -npm install @mempool/bisq.js --save - -# yarn -yarn add @mempool/bisq.js`; - } - if (this.env.BASE_MODULE === 'liquid') { importTemplate = `# npm npm install @mempool/liquid.js --save @@ -257,9 +221,6 @@ yarn add @mempool/liquid.js`; if (this.network === 'liquidtestnet') { return this.replaceCurlPlaceholder(code.codeTemplate.curl, code.codeSampleLiquidTestnet); } - if (this.network === 'bisq') { - return this.replaceCurlPlaceholder(code.codeTemplate.curl, code.codeSampleBisq); - } if (this.network === '' || this.network === 'main') { return this.replaceCurlPlaceholder(code.codeTemplate.curl, code.codeSampleMainnet); } @@ -282,9 +243,6 @@ yarn add @mempool/liquid.js`; if (this.network === 'liquidtestnet') { return code.codeSampleLiquidTestnet.response; } - if (this.network === 'bisq') { - return code.codeSampleBisq.response; - } return code.codeSampleMainnet.response; } diff --git a/frontend/src/app/docs/docs.routing.module.ts b/frontend/src/app/docs/docs.routing.module.ts index 1babb1dcf..3c0eb961d 100644 --- a/frontend/src/app/docs/docs.routing.module.ts +++ b/frontend/src/app/docs/docs.routing.module.ts @@ -8,7 +8,7 @@ const browserWindowEnv = browserWindow.__env || {}; let routes: Routes = []; -if (browserWindowEnv.BASE_MODULE && (browserWindowEnv.BASE_MODULE === 'bisq' || browserWindowEnv.BASE_MODULE === 'liquid')) { +if (browserWindowEnv.BASE_MODULE && browserWindowEnv.BASE_MODULE === 'liquid') { routes = [ { path: '', diff --git a/frontend/src/app/docs/docs/docs.component.ts b/frontend/src/app/docs/docs/docs.component.ts index e3737b545..35080a19f 100644 --- a/frontend/src/app/docs/docs/docs.component.ts +++ b/frontend/src/app/docs/docs/docs.component.ts @@ -31,9 +31,8 @@ export class DocsComponent implements OnInit { ngOnInit(): void { this.websocket.want(['blocks']); this.env = this.stateService.env; - this.showWebSocketTab = ( ! ( ( this.stateService.network === "bisq" ) || ( this.stateService.network === "liquidtestnet" ) ) ); this.showFaqTab = ( this.env.BASE_MODULE === 'mempool' ) ? true : false; - this.showElectrsTab = this.stateService.env.OFFICIAL_MEMPOOL_SPACE && ( this.stateService.network !== "bisq" ); + this.showElectrsTab = this.stateService.env.OFFICIAL_MEMPOOL_SPACE; document.querySelector( "html" ).style.scrollBehavior = "smooth"; } @@ -50,10 +49,8 @@ export class DocsComponent implements OnInit { } else if( url[1].path === "rest" ) { this.activeTab = 1; this.seoService.setTitle($localize`:@@meta.title.docs.rest:REST API`); - if( this.stateService.network === 'liquid' || this.stateService.network === 'liquidtestnet' ) { + if (this.stateService.network === 'liquid' || this.stateService.network === 'liquidtestnet' ) { this.seoService.setDescription($localize`:@@meta.description.docs.rest-liquid:Documentation for the liquid.network REST API service: get info on addresses, transactions, assets, blocks, and more.`); - } else if( this.stateService.network === 'bisq' ) { - this.seoService.setDescription($localize`:@@meta.description.docs.rest-bisq:Documentation for the bisq.markets REST API service: get info on recent trades, current offers, transactions, network state, and more.`); } else { this.seoService.setDescription($localize`:@@meta.description.docs.rest-bitcoin:Documentation for the mempool.space REST API service: get info on addresses, transactions, blocks, fees, mining, the Lightning network, and more.`); } diff --git a/frontend/src/app/interfaces/websocket.interface.ts b/frontend/src/app/interfaces/websocket.interface.ts index 9553fef02..cf0e75141 100644 --- a/frontend/src/app/interfaces/websocket.interface.ts +++ b/frontend/src/app/interfaces/websocket.interface.ts @@ -35,7 +35,6 @@ export interface WebsocketResponse { 'track-rbf'?: string; 'track-rbf-summary'?: boolean; 'watch-mempool'?: boolean; - 'track-bisq-market'?: string; 'refresh-blocks'?: boolean; } diff --git a/frontend/src/app/lightning/lightning-api.service.ts b/frontend/src/app/lightning/lightning-api.service.ts index 4be878a18..736c12c13 100644 --- a/frontend/src/app/lightning/lightning-api.service.ts +++ b/frontend/src/app/lightning/lightning-api.service.ts @@ -23,9 +23,6 @@ export class LightningApiService { } this.apiBasePath = ''; // assume mainnet by default this.stateService.networkChanged$.subscribe((network) => { - if (network === 'bisq' && !this.stateService.env.BISQ_SEPARATE_BACKEND) { - network = ''; - } this.apiBasePath = network ? '/' + network : ''; }); } diff --git a/frontend/src/app/services/api.service.ts b/frontend/src/app/services/api.service.ts index 2d5ec03d4..1e752f5ec 100644 --- a/frontend/src/app/services/api.service.ts +++ b/frontend/src/app/services/api.service.ts @@ -29,9 +29,6 @@ export class ApiService { } this.apiBasePath = ''; // assume mainnet by default this.stateService.networkChanged$.subscribe((network) => { - if (network === 'bisq' && !this.stateService.env.BISQ_SEPARATE_BACKEND) { - network = ''; - } this.apiBasePath = network ? '/' + network : ''; }); } diff --git a/frontend/src/app/services/electrs-api.service.ts b/frontend/src/app/services/electrs-api.service.ts index 748194a21..57dcbb762 100644 --- a/frontend/src/app/services/electrs-api.service.ts +++ b/frontend/src/app/services/electrs-api.service.ts @@ -25,9 +25,6 @@ export class ElectrsApiService { } this.apiBasePath = ''; // assume mainnet by default this.stateService.networkChanged$.subscribe((network) => { - if (network === 'bisq') { - network = ''; - } this.apiBasePath = network ? '/' + network : ''; }); } diff --git a/frontend/src/app/services/enterprise.service.ts b/frontend/src/app/services/enterprise.service.ts index ba17668ef..4ad31bd9f 100644 --- a/frontend/src/app/services/enterprise.service.ts +++ b/frontend/src/app/services/enterprise.service.ts @@ -44,7 +44,6 @@ export class EnterpriseService { this.stateService.env.LIQUID_ENABLED = false; this.stateService.env.LIQUID_TESTNET_ENABLED = false; this.stateService.env.SIGNET_ENABLED = false; - this.stateService.env.BISQ_ENABLED = false; } fetchSubdomainInfo(): void { @@ -81,14 +80,6 @@ export class EnterpriseService { siteId = 10; statsUrl = '//stats.liquid.network/'; break; - case 'bisq.markets': - siteId = 7; - statsUrl = '//stats.bisq.markets/'; - break; - case 'bisq.ninja': - statsUrl = '//stats.bisq.markets/'; - siteId = 11; - break; default: return; } diff --git a/frontend/src/app/services/navigation.service.ts b/frontend/src/app/services/navigation.service.ts index 661a8c38f..2db3f6025 100644 --- a/frontend/src/app/services/navigation.service.ts +++ b/frontend/src/app/services/navigation.service.ts @@ -17,12 +17,7 @@ const networkModules = { { name: 'liquid', path: '' }, { name: 'liquidtestnet', path: '/testnet' }, ], - }, - bisq: { - subnets: [ - { name: 'bisq', path: '' }, - ], - }, + } }; const networks = Object.keys(networkModules); @@ -44,7 +39,7 @@ export class NavigationService { }); } - // For each network (bitcoin/liquid/bisq), find and save the longest url path compatible with the current route + // For each network (bitcoin/liquid), find and save the longest url path compatible with the current route updateSubnetPaths(root: ActivatedRouteSnapshot): void { let path = ''; const networkPaths = {}; diff --git a/frontend/src/app/services/seo.service.ts b/frontend/src/app/services/seo.service.ts index cb9a321d6..45d62ebdd 100644 --- a/frontend/src/app/services/seo.service.ts +++ b/frontend/src/app/services/seo.service.ts @@ -71,8 +71,6 @@ export class SeoService { let domain = 'mempool.space'; if (this.stateService.env.BASE_MODULE === 'liquid') { domain = 'liquid.network'; - } else if (this.stateService.env.BASE_MODULE === 'bisq') { - domain = 'bisq.markets'; } this.canonicalLink.setAttribute('href', 'https://' + domain + path); } @@ -86,8 +84,6 @@ export class SeoService { return this.baseTitle + ' - Liquid Network'; if (this.network === 'liquidtestnet') return this.baseTitle + ' - Liquid Testnet'; - if (this.network === 'bisq') - return this.baseTitle + ' - Bisq Markets'; return this.baseTitle + ' - ' + (this.network ? this.ucfirst(this.network) : 'Bitcoin') + ' Explorer'; } @@ -96,8 +92,6 @@ export class SeoService { return this.baseDescription + ' See the real-time status of your transactions, browse network stats, and more.'; if ( (this.network === 'liquid') || (this.network === 'liquidtestnet') ) return this.baseDescription + ' See Liquid transactions & assets, get network info, and more.'; - if (this.network === 'bisq') - return this.baseDescription + ' See Bisq market prices, trading activity, and more.'; } ucfirst(str: string) { diff --git a/frontend/src/app/services/services-api.service.ts b/frontend/src/app/services/services-api.service.ts index 9fcd9ea11..0caa06168 100644 --- a/frontend/src/app/services/services-api.service.ts +++ b/frontend/src/app/services/services-api.service.ts @@ -52,9 +52,6 @@ export class ServicesApiServices { } this.apiBasePath = ''; // assume mainnet by default this.stateService.networkChanged$.subscribe((network) => { - if (network === 'bisq' && !this.stateService.env.BISQ_SEPARATE_BACKEND) { - network = ''; - } this.apiBasePath = network ? '/' + network : ''; }); diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts index 9a591452e..8fdf64d4c 100644 --- a/frontend/src/app/services/state.service.ts +++ b/frontend/src/app/services/state.service.ts @@ -25,8 +25,6 @@ export interface Env { SIGNET_ENABLED: boolean; LIQUID_ENABLED: boolean; LIQUID_TESTNET_ENABLED: boolean; - BISQ_ENABLED: boolean; - BISQ_SEPARATE_BACKEND: boolean; ITEMS_PER_PAGE: number; KEEP_BLOCKS_AMOUNT: number; OFFICIAL_MEMPOOL_SPACE: boolean; @@ -40,7 +38,6 @@ export interface Env { PACKAGE_JSON_VERSION: string; MEMPOOL_WEBSITE_URL: string; LIQUID_WEBSITE_URL: string; - BISQ_WEBSITE_URL: string; MINING_DASHBOARD: boolean; LIGHTNING: boolean; AUDIT: boolean; @@ -60,8 +57,6 @@ const defaultEnv: Env = { 'LIQUID_ENABLED': false, 'LIQUID_TESTNET_ENABLED': false, 'BASE_MODULE': 'mempool', - 'BISQ_ENABLED': false, - 'BISQ_SEPARATE_BACKEND': false, 'ITEMS_PER_PAGE': 10, 'KEEP_BLOCKS_AMOUNT': 8, 'OFFICIAL_MEMPOOL_SPACE': false, @@ -74,7 +69,6 @@ const defaultEnv: Env = { 'PACKAGE_JSON_VERSION': '', 'MEMPOOL_WEBSITE_URL': 'https://mempool.space', 'LIQUID_WEBSITE_URL': 'https://liquid.network', - 'BISQ_WEBSITE_URL': 'https://bisq.markets', 'MINING_DASHBOARD': true, 'LIGHTNING': false, 'AUDIT': false, @@ -213,11 +207,6 @@ export class StateService { } }, {})); - if (this.env.BASE_MODULE === 'bisq') { - this.network = this.env.BASE_MODULE; - this.networkChanged$.next(this.env.BASE_MODULE); - } - this.networkChanged$.subscribe((network) => { this.transactions$ = new BehaviorSubject(null); this.blocksSubject$.next([]); @@ -266,9 +255,9 @@ export class StateService { // /^\/ starts with a forward slash... // (?:[a-z]{2}(?:-[A-Z]{2})?\/)? optional locale prefix (non-capturing) // (?:preview\/)? optional "preview" prefix (non-capturing) - // (bisq|testnet|liquidtestnet|liquid|signet)/ network string (captured as networkMatches[1]) + // (testnet|liquidtestnet|liquid|signet)/ network string (captured as networkMatches[1]) // ($|\/) network string must end or end with a slash - const networkMatches = url.match(/^\/(?:[a-z]{2}(?:-[A-Z]{2})?\/)?(?:preview\/)?(bisq|testnet|liquidtestnet|liquid|signet)($|\/)/); + const networkMatches = url.match(/^\/(?:[a-z]{2}(?:-[A-Z]{2})?\/)?(?:preview\/)?(testnet|liquidtestnet|liquid|signet)($|\/)/); switch (networkMatches && networkMatches[1]) { case 'liquid': if (this.network !== 'liquid') { @@ -299,12 +288,6 @@ export class StateService { } } return; - case 'bisq': - if (this.network !== 'bisq') { - this.network = 'bisq'; - this.networkChanged$.next('bisq'); - } - return; default: if (this.env.BASE_MODULE !== 'mempool') { if (this.network !== this.env.BASE_MODULE) { diff --git a/frontend/src/app/services/websocket.service.ts b/frontend/src/app/services/websocket.service.ts index 61ac15fd3..a694d3fcc 100644 --- a/frontend/src/app/services/websocket.service.ts +++ b/frontend/src/app/services/websocket.service.ts @@ -54,7 +54,7 @@ export class WebsocketService { .pipe(take(1)) .subscribe((response) => this.handleResponse(response)); } else { - this.network = this.stateService.network === 'bisq' && !this.stateService.env.BISQ_SEPARATE_BACKEND ? '' : this.stateService.network; + this.network = this.stateService.network; this.websocketSubject = webSocket(this.webSocketUrl.replace('{network}', this.network ? '/' + this.network : '')); const { response: theInitData } = this.transferState.get(initData, null) || {}; @@ -70,9 +70,6 @@ export class WebsocketService { } this.stateService.networkChanged$.subscribe((network) => { - if (network === 'bisq' && !this.stateService.env.BISQ_SEPARATE_BACKEND) { - network = ''; - } if (network === this.network) { return; } @@ -237,14 +234,6 @@ export class WebsocketService { this.isTrackingRbfSummary = false; } - startTrackBisqMarket(market: string) { - this.websocketSubject.next({ 'track-bisq-market': market }); - } - - stopTrackingBisqMarket() { - this.websocketSubject.next({ 'track-bisq-market': 'stop' }); - } - fetchStatistics(historicalDate: string) { this.websocketSubject.next({ historicalDate }); } diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html index b92e8a339..cc9cb3538 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.html +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html @@ -62,7 +62,6 @@

Signet Explorer

Liquid Testnet Explorer

Liquid Explorer

-

Bisq Explorer

diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.ts b/frontend/src/app/shared/components/global-footer/global-footer.component.ts index e76a5de0d..5300ba107 100644 --- a/frontend/src/app/shared/components/global-footer/global-footer.component.ts +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.ts @@ -82,8 +82,5 @@ export class GlobalFooterComponent implements OnInit { if( network === 'liquid' || network === 'liquidtestnet' ) { return (this.env.BASE_MODULE === 'liquid' ? '' : this.env.LIQUID_WEBSITE_URL + this.urlLanguage) + this.networkPaths[thisNetwork] || '/'; } - if( network === 'bisq' ) { - return (this.env.BASE_MODULE === 'bisq' ? '' : this.env.BISQ_WEBSITE_URL + this.urlLanguage) + this.networkPaths[thisNetwork] || '/'; - } } } diff --git a/frontend/src/app/shared/regex.utils.ts b/frontend/src/app/shared/regex.utils.ts index 93f4b9275..422d538e0 100644 --- a/frontend/src/app/shared/regex.utils.ts +++ b/frontend/src/app/shared/regex.utils.ts @@ -124,25 +124,11 @@ const ADDRESS_CHARS: { + `{20,100}` + `)`, }, - bisq: { - base58: `(?:[bB][13]` // b or B at the start, followed by a single 1 or 3 - + BASE58_CHARS - + `{26,33})`, - bech32: `(?:` - + `[bB]bc1` // b or B at the start, followed by bc1 - + BECH32_CHARS_LW - + `{20,100}` - + `|` - + `[bB]BC1` // b or B at the start, followed by BC1 - + BECH32_CHARS_UP - + `{20,100}` - + `)`, - }, } type RegexTypeNoAddrNoBlockHash = | `transaction` | `blockheight` | `date` | `timestamp`; export type RegexType = `address` | `blockhash` | RegexTypeNoAddrNoBlockHash; -export const NETWORKS = [`testnet`, `signet`, `liquid`, `liquidtestnet`, `bisq`, `mainnet`] as const; +export const NETWORKS = [`testnet`, `signet`, `liquid`, `liquidtestnet`, `mainnet`] as const; export type Network = typeof NETWORKS[number]; // Turn const array into union type export const ADDRESS_REGEXES: [RegExp, Network][] = NETWORKS @@ -164,8 +150,6 @@ function isNetworkAvailable(network: Network, env: Env): boolean { return env.LIQUID_ENABLED === true; case 'liquidtestnet': return env.LIQUID_TESTNET_ENABLED === true; - case 'bisq': - return env.BISQ_ENABLED === true; case 'mainnet': return true; // There is no "MAINNET_ENABLED" flag default: @@ -173,7 +157,7 @@ function isNetworkAvailable(network: Network, env: Env): boolean { } } -export function needBaseModuleChange(fromBaseModule: 'mempool' | 'liquid' | 'bisq', toNetwork: Network): boolean { +export function needBaseModuleChange(fromBaseModule: 'mempool' | 'liquid', toNetwork: Network): boolean { if (!toNetwork) return false; // No target network means no change needed if (fromBaseModule === 'mempool') { return toNetwork !== 'mainnet' && toNetwork !== 'testnet' && toNetwork !== 'signet'; @@ -181,9 +165,6 @@ export function needBaseModuleChange(fromBaseModule: 'mempool' | 'liquid' | 'bis if (fromBaseModule === 'liquid') { return toNetwork !== 'liquid' && toNetwork !== 'liquidtestnet'; } - if (fromBaseModule === 'bisq') { - return toNetwork !== 'bisq'; - } } export function getTargetUrl(toNetwork: Network, address: string, env: Env): string { @@ -194,11 +175,6 @@ export function getTargetUrl(toNetwork: Network, address: string, env: Env): str targetUrl += '/address/'; targetUrl += address; } - if (toNetwork === 'bisq') { - targetUrl = env.BISQ_WEBSITE_URL; - targetUrl += '/address/'; - targetUrl += address; - } if (toNetwork === 'mainnet' || toNetwork === 'testnet' || toNetwork === 'signet') { targetUrl = env.MEMPOOL_WEBSITE_URL; targetUrl += (toNetwork === 'mainnet' ? '' : `/${toNetwork}`); @@ -242,9 +218,6 @@ export function getRegex(type: RegexType, network?: Network): RegExp { case `liquidtestnet`: leadingZeroes = 8; // We are not interested in Liquid block hashes break; - case `bisq`: - leadingZeroes = 8; // Assumes at least 32 bits of difficulty - break; default: throw new Error(`Invalid Network ${network} (Unreachable error in TypeScript)`); } @@ -307,11 +280,6 @@ export function getRegex(type: RegexType, network?: Network): RegExp { regex += `|`; // OR regex += ADDRESS_CHARS.liquidtestnet.bech32; break; - case `bisq`: - regex += ADDRESS_CHARS.bisq.base58; - regex += `|`; // OR - regex += ADDRESS_CHARS.bisq.bech32; - break; default: throw new Error(`Invalid Network ${network} (Unreachable error in TypeScript)`); } diff --git a/frontend/src/index.bisq.html b/frontend/src/index.bisq.html deleted file mode 100644 index 48ee7301b..000000000 --- a/frontend/src/index.bisq.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - mempool - Bisq Markets - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/src/resources/bisq/bisq-markets-preview.png b/frontend/src/resources/bisq/bisq-markets-preview.png deleted file mode 100644 index 2b5e1250b9d5a69cd25c9de9efdeb53a1f125f46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96581 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 Az5oCK diff --git a/frontend/src/resources/bisq/favicons/android-chrome-192x192.png b/frontend/src/resources/bisq/favicons/android-chrome-192x192.png deleted file mode 100644 index 696b1ed4f96c312da0defb945d62c4d4277f0229..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9127 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

!%6 z5sBo9k1IpcwT(jck(XBXf9c5VvAyGk1QD0YSYM*d)rkCdvu2*^8bnfM z;5)a)4MMy2KfkY=g7`5i_v-!-LL)!@qj(Bhx{SFoH@8w~Rb1*WjCleA$3di0TYkFe zCRAeIGJUagDFd5^AF_Yk8@K6MA!cmF%e%MU2$;4@i}CW}g=)c=Jm z3)?J1TwnQ~(ij~Jq6NKRkX+}Rts_5y(LNu;KLyldVcy^8#b?RZa89e%_Kd|B{l z-cE55XE6Ije0PvF0rsXa9bWO))Nk%-iE^}R%Z7r2Vc!$zyFBLoY}^TXlA8SRHyUOJ ze76?+wD6A1fGaP)1^Z^Twv2OeO)ku^xZq+y zO7)Dp#n*Zc$%neD9W@Q|*jpm_5Bx2mS9UkuK`M(B9k*)??0;`<(BZ3Fhn~W<`A&~G z3F-}-vnQ*Bz>883B=_1g|2>f1Pl+5p^srK5b81nDLP)Jz^)^8}5Rjp}+fgSD7sERn zTi_~aHEs=p)OA5=BQ+UAaFe%LvzN8qgHf7zN;|B9)?#KgNqY;damln|Zczqi!xYti zh@}n*?cx0lAnwo%c_%}=bwah_gE zM_{;Dz@!21GHV?VF6(6WLScWu^D@6qO7uLK$EtvqZWZYM)Qdgd#2R)hGj|E+MQf!4Wm^HjW5u=1RY(Uw9dtFd6*M2;$fT6YmT?>Qz-h z-@1z{lCBlI-k7uE`-dEs#=lT{@I+&qnJGoZqi~ttf{#)D-J!8r;zk$)JRHEv(cY%! zh|)2bU$4h0KTmzV_n}ZW!m(b_61{W{bF9B%;e&pzY~zCSz)!222LYeh=`*3nqn=6LyL-uSrR^%ytLCQYQWpXTQ(uI!`x@z58o> z7@%$*;Or3KBIo4iatDBfxCBTFo*wQW?Pu>NMn*jQqAd#SGSLQ{s65WN PlK`~TpR3iX*uVcDyVEwD diff --git a/frontend/src/resources/bisq/favicons/browserconfig.xml b/frontend/src/resources/bisq/favicons/browserconfig.xml deleted file mode 100644 index f094335eb..000000000 --- a/frontend/src/resources/bisq/favicons/browserconfig.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - #000000 - - - diff --git a/frontend/src/resources/bisq/favicons/favicon-16x16.png b/frontend/src/resources/bisq/favicons/favicon-16x16.png deleted file mode 100644 index 873024acde58b3577ffab3fd8d0a67ccc6dbb8ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 842 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>`Z@Ck9%GxmfaT_X=T z8^{21bqzgr9Nd&=o60TLm71X`)~h1iEYDvl%~K%GT_DbxA;OU^%#j90>B8)3LhNaR zKoTg(nJEG^!P-8=$vxWMCBneeTi?VhDmFi_upuq8%G@R}I=&#UurWQW+QKGK&&V@6 zuE4@NP}k92*TG%S$s;N=FR!{Gt)$Z2(_dw_soEU#;0+1syNVOG<>)Q2lV7Z-xJ2K7 zdvwbFyqG=dn#;|lXJ|^#(2||0?XxaCaeH>;mK3$Q#^QadlKpC)%R=HdW`wOxP@1eS z+@c`bs^m5=AZAr+@X}bhPA&c_8Nq5<$7$XXixLCoMo2ZN0{sQ_opgn&O0AwkwH9BY z`EvX zzi~JA{eLkl^L6Kb{r#2J`frUcdck(0DUx>)r`Vdbe25(fcl(Zl$Ms-*Nu|pc_?7Tq8l|QWL(-6&pOTqYiCe?p2o+Fp zhF66|lmsP~D-;yvr)B1(DwI?fq$*?3oE!Zm>f=FR^A+!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+0815Pl&6YvAdqJC&MlV z_7ou?gJfjnscY}9I>%gTwV}cieYyF%GPAX%rfNt`P!sD`5ouEtYLpkKk>x9w;w_Q@ zBJNxD6O{i3IsY>WsaHK>d=f`CF#40lXm1AEp$?yV+Qnv;wnSu?E$Gr z3Q~^bryj{qIFzlo-d16$KG1jaOZ1#J`K27lOFodBd>}7wU#9LVYk9D*~yT^ZU-EoEkD0|P{QmX_Tr@5G(i2|KeAc4kL!Pt#mr4h$v9sp_^% zJrcHN#&6Ax+MJ?3+e8u^bm9|Ktrxn-ZOVwU1Muc#3u_Th4WjU6&TK zE;VLdTKJkoex*he~ECowtfRW3UE6SBC z28`VQ|NrZ9?U4qiKjV@hzhEHEV72YT&mZsB=-XU7rMr8{x5sbazWsm%zCGK!!v5wt zL%Tg+e*gZo$+((rRuoVdW0JSK%L&|5TfYNQAE{-7< zr;`&B5>u0(AK_~YOP4O4x^*LB z2IKBJ>1buPr4WI-7&nYVL*Al6M(L1ae~bKX0-dGq|@^zzm%;<O?7RR zm5sHnJtrx$^A!o6+4HCA(4j?-Chd{YYzxxRa9(ywTWj^IRoPjmy_ZV9+R*r`?bxzq z%brcUW+mBXma|~*;?1j9?_R!rukW;l{L(Mx8x&qzax!?C-|NZAGx~VX%&^S<_U2~s zGr#$I=MDI!XY5aSxX878x=yT_e`Dg$PfxWQ1h^LTOkEweK5}!}-Cw-gB9dl#w{~P+ zUUqi2dEUJ}oG0$=NEM!NZ&&W`K3VJXxA%5s|BsoSPtIyjc|TY4E5V!x zFD@n@?~}DHd(t7*yz5w@jYDvEqi3{xxW7E#mj^5Y5)x8|%nWne3+%u69cKYXl4^-- zL`h0wNvc(HQ7VvPFfuSQ)HSfsH8cz{G`BJ|wK6f$HZZUCy&nOiTJTUc4xd$I_#u!2j2$>9`c<;@`qr*B+2apcSqnIr6{8$1?x=`p+#7cBYY SWI7dS1%s!npUXO@geCxKO#Zz9 diff --git a/frontend/src/resources/bisq/favicons/favicon.ico b/frontend/src/resources/bisq/favicons/favicon.ico deleted file mode 100644 index ba6406e2afbef8bcbb886138b3f3708f25ecfde9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15086 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 - - - -Created by potrace 1.14, written by Peter Selinger 2001-2017 - - - - - diff --git a/frontend/src/resources/bisq/favicons/site.webmanifest b/frontend/src/resources/bisq/favicons/site.webmanifest deleted file mode 100644 index 99227fcb5..000000000 --- a/frontend/src/resources/bisq/favicons/site.webmanifest +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "bisq.markets", - "short_name": "bisq.markets", - "icons": [ - { - "src": "/resources/bisq/favicons/android-chrome-192x192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "/resources/bisq/favicons/android-chrome-384x384.png", - "sizes": "384x384", - "type": "image/png" - } - ], - "theme_color": "#000000", - "background_color": "#000000", - "display": "standalone" -} diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index c9f993870..f38d25bf1 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -1171,7 +1171,7 @@ th { display: none; } -app-master-page, app-liquid-master-page, app-bisq-master-page { +app-master-page, app-liquid-master-page { display: flex; flex-direction: column; min-height: 100vh; From 3f80dbc5ce45eda7f59fdb03582623a60305c40a Mon Sep 17 00:00:00 2001 From: natsoni Date: Mon, 1 Apr 2024 18:00:10 +0900 Subject: [PATCH 04/17] Fix random console errors on block loading --- .../src/app/components/block/block.component.html | 14 +++++++------- .../src/app/components/block/block.component.ts | 6 +++--- .../transactions-list.component.ts | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index 0c0655c01..282863fab 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -39,7 +39,7 @@

- + @@ -126,16 +126,16 @@ - + - + - + - diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index 79f8ebebe..93fb97fac 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -42,6 +42,7 @@ interface AuditStatus { seen?: boolean; expected?: boolean; added?: boolean; + prioritized?: boolean; delayed?: number; accelerated?: boolean; conflict?: boolean; @@ -317,13 +318,15 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { fetchAudit ? this.apiService.getBlockAudit$(hash).pipe( map(audit => { const isAdded = audit.addedTxs.includes(txid); + const isPrioritized = audit.prioritizedTxs.includes(txid); const isAccelerated = audit.acceleratedTxs.includes(txid); const isConflict = audit.fullrbfTxs.includes(txid); const isExpected = audit.template.some(tx => tx.txid === txid); return { - seen: isExpected || !(isAdded || isConflict), + seen: isExpected || isPrioritized || isAccelerated, expected: isExpected, added: isAdded, + prioritized: isPrioritized, conflict: isConflict, accelerated: isAccelerated, }; diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts index a3155263e..f396ba6ae 100644 --- a/frontend/src/app/dashboard/dashboard.component.ts +++ b/frontend/src/app/dashboard/dashboard.component.ts @@ -1,8 +1,8 @@ import { AfterViewInit, ChangeDetectionStrategy, Component, HostListener, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core'; import { combineLatest, EMPTY, fromEvent, interval, merge, Observable, of, Subject, Subscription, timer } from 'rxjs'; import { catchError, delayWhen, distinctUntilChanged, filter, map, scan, share, shareReplay, startWith, switchMap, takeUntil, tap, throttleTime } from 'rxjs/operators'; -import { AuditStatus, BlockExtended, CurrentPegs, FederationAddress, FederationUtxo, OptimizedMempoolStats, PegsVolume, RecentPeg } from '../interfaces/node-api.interface'; -import { MempoolInfo, TransactionStripped, ReplacementInfo } from '../interfaces/websocket.interface'; +import { AuditStatus, BlockExtended, CurrentPegs, FederationAddress, FederationUtxo, OptimizedMempoolStats, PegsVolume, RecentPeg, TransactionStripped } from '../interfaces/node-api.interface'; +import { MempoolInfo, ReplacementInfo } from '../interfaces/websocket.interface'; import { ApiService } from '../services/api.service'; import { StateService } from '../services/state.service'; import { WebsocketService } from '../services/websocket.service'; diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts index 9680d2069..8441acc14 100644 --- a/frontend/src/app/interfaces/node-api.interface.ts +++ b/frontend/src/app/interfaces/node-api.interface.ts @@ -208,6 +208,7 @@ export interface BlockExtended extends Block { export interface BlockAudit extends BlockExtended { missingTxs: string[], addedTxs: string[], + prioritizedTxs: string[], freshTxs: string[], sigopTxs: string[], fullrbfTxs: string[], @@ -231,7 +232,7 @@ export interface TransactionStripped { acc?: boolean; flags?: number | null; time?: number; - status?: 'found' | 'missing' | 'sigop' | 'fresh' | 'freshcpfp' | 'added' | 'censored' | 'selected' | 'rbf' | 'accelerated'; + status?: 'found' | 'missing' | 'sigop' | 'fresh' | 'freshcpfp' | 'added' | 'prioritized' | 'censored' | 'selected' | 'rbf' | 'accelerated'; context?: 'projected' | 'actual'; } diff --git a/frontend/src/app/interfaces/websocket.interface.ts b/frontend/src/app/interfaces/websocket.interface.ts index 4e838e417..cc2fa6207 100644 --- a/frontend/src/app/interfaces/websocket.interface.ts +++ b/frontend/src/app/interfaces/websocket.interface.ts @@ -1,7 +1,7 @@ import { SafeResourceUrl } from '@angular/platform-browser'; import { ILoadingIndicators } from '../services/state.service'; import { Transaction } from './electrs.interface'; -import { BlockExtended, DifficultyAdjustment, RbfTree } from './node-api.interface'; +import { BlockExtended, DifficultyAdjustment, RbfTree, TransactionStripped } from './node-api.interface'; export interface WebsocketResponse { backend?: 'esplora' | 'electrum' | 'none'; @@ -93,19 +93,6 @@ export interface MempoolInfo { minrelaytxfee: number; // (numeric) Current minimum relay fee for transactions } -export interface TransactionStripped { - txid: string; - fee: number; - vsize: number; - value: number; - acc?: boolean; // is accelerated? - rate?: number; // effective fee rate - flags?: number; - time?: number; - status?: 'found' | 'missing' | 'sigop' | 'fresh' | 'freshcpfp' | 'added' | 'censored' | 'selected' | 'rbf' | 'accelerated'; - context?: 'projected' | 'actual'; -} - // [txid, fee, vsize, value, rate, flags, acceleration?] export type TransactionCompressed = [string, number, number, number, number, number, number, 1?]; // [txid, rate, flags, acceleration?] diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts index 951cd9131..c7eae3737 100644 --- a/frontend/src/app/services/state.service.ts +++ b/frontend/src/app/services/state.service.ts @@ -1,8 +1,8 @@ import { Inject, Injectable, PLATFORM_ID, LOCALE_ID } from '@angular/core'; import { ReplaySubject, BehaviorSubject, Subject, fromEvent, Observable, merge } from 'rxjs'; import { Transaction } from '../interfaces/electrs.interface'; -import { HealthCheckHost, IBackendInfo, MempoolBlock, MempoolBlockDelta, MempoolInfo, Recommendedfees, ReplacedTransaction, ReplacementInfo, TransactionStripped } from '../interfaces/websocket.interface'; -import { BlockExtended, CpfpInfo, DifficultyAdjustment, MempoolPosition, OptimizedMempoolStats, RbfTree } from '../interfaces/node-api.interface'; +import { HealthCheckHost, IBackendInfo, MempoolBlock, MempoolBlockDelta, MempoolInfo, Recommendedfees, ReplacedTransaction, ReplacementInfo } from '../interfaces/websocket.interface'; +import { BlockExtended, CpfpInfo, DifficultyAdjustment, MempoolPosition, OptimizedMempoolStats, RbfTree, TransactionStripped } from '../interfaces/node-api.interface'; import { Router, NavigationStart } from '@angular/router'; import { isPlatformBrowser } from '@angular/common'; import { filter, map, scan, shareReplay } from 'rxjs/operators'; diff --git a/frontend/src/app/shared/common.utils.ts b/frontend/src/app/shared/common.utils.ts index 482d9567f..be1e32c73 100644 --- a/frontend/src/app/shared/common.utils.ts +++ b/frontend/src/app/shared/common.utils.ts @@ -1,4 +1,5 @@ -import { MempoolBlockDelta, MempoolBlockDeltaCompressed, MempoolDeltaChange, TransactionCompressed, TransactionStripped } from "../interfaces/websocket.interface"; +import { MempoolBlockDelta, MempoolBlockDeltaCompressed, MempoolDeltaChange, TransactionCompressed } from "../interfaces/websocket.interface"; +import { TransactionStripped } from "../interfaces/node-api.interface"; export function isMobile(): boolean { return (window.innerWidth <= 767.98); From faa990a2c6b9184e02a7f66d3950cbb3222abc8d Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 2 Apr 2024 14:55:52 +0900 Subject: [PATCH 08/17] ops: Remove bisq from build script --- production/mempool-build-all | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/production/mempool-build-all b/production/mempool-build-all index b45c0edc6..d6ffcf8b2 100755 --- a/production/mempool-build-all +++ b/production/mempool-build-all @@ -129,8 +129,8 @@ export NVM_DIR="${HOME}/.nvm" source "${NVM_DIR}/nvm.sh" # what to look for -frontends=(mainnet liquid bisq) -backends=(mainnet testnet signet liquid liquidtestnet bisq) +frontends=(mainnet liquid) +backends=(mainnet testnet signet liquid liquidtestnet) frontend_repos=() backend_repos=() @@ -151,7 +151,7 @@ for repo in $backend_repos;do done # build unfurlers -for repo in mainnet liquid bisq;do +for repo in mainnet liquid;do build_unfurler "${repo}" done @@ -166,7 +166,7 @@ for repo in $frontend_repos;do done # ship frontend dist folders to public_html -for target in mainnet liquid bisq;do +for target in mainnet liquid;do ship_frontend "${target}" done From 8bec0cacdb7706887aa5249149488c92b2b13622 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 2 Apr 2024 14:58:21 +0900 Subject: [PATCH 09/17] ops: Remove bisq from start script --- production/mempool-start-all | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/production/mempool-start-all b/production/mempool-start-all index b01fe8aff..4c0a9607c 100755 --- a/production/mempool-start-all +++ b/production/mempool-start-all @@ -4,7 +4,7 @@ source "$NVM_DIR/nvm.sh" nvm use v20.7.0 # start all mempool backends that exist -for site in mainnet mainnet-lightning testnet testnet-lightning signet signet-lightning bisq liquid liquidtestnet;do +for site in mainnet mainnet-lightning testnet testnet-lightning signet signet-lightning liquid liquidtestnet;do cd "${HOME}/${site}/backend/" && \ echo "starting mempool backend: ${site}" && \ screen -dmS "${site}" sh -c 'while true;do npm run start-production;sleep 1;done' @@ -15,7 +15,7 @@ screen -dmS x startx sleep 3 # start unfurlers for each frontend -for site in mainnet liquid bisq;do +for site in mainnet liquid ;do cd "$HOME/${site}/unfurler" && \ echo "starting mempool unfurler: ${site}" && \ screen -dmS "unfurler-${site}" sh -c 'while true;do npm run unfurler;sleep 2;done' From ce057bad208fc2ab9ccf9783662275509fdabdd5 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 2 Apr 2024 14:58:55 +0900 Subject: [PATCH 10/17] ops: Bump NodeJS to v20.12.0 in start script --- production/mempool-start-all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/mempool-start-all b/production/mempool-start-all index b01fe8aff..8638cabf9 100755 --- a/production/mempool-start-all +++ b/production/mempool-start-all @@ -1,7 +1,7 @@ #!/usr/bin/env zsh export NVM_DIR="$HOME/.nvm" source "$NVM_DIR/nvm.sh" -nvm use v20.7.0 +nvm use v20.12.0 # start all mempool backends that exist for site in mainnet mainnet-lightning testnet testnet-lightning signet signet-lightning bisq liquid liquidtestnet;do From 4bb1320563ef19b5b901c7d68d44d752732c200f Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn Date: Tue, 2 Apr 2024 15:14:02 +0900 Subject: [PATCH 11/17] Re-enable and fix Liquid tests --- frontend/cypress/e2e/liquid/liquid.spec.ts | 17 +++++++++++++---- .../e2e/liquidtestnet/liquidtestnet.spec.ts | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/frontend/cypress/e2e/liquid/liquid.spec.ts b/frontend/cypress/e2e/liquid/liquid.spec.ts index 2d1fbd1e9..8548059bb 100644 --- a/frontend/cypress/e2e/liquid/liquid.spec.ts +++ b/frontend/cypress/e2e/liquid/liquid.spec.ts @@ -1,4 +1,4 @@ -describe.skip('Liquid', () => { +describe('Liquid', () => { const baseModule = Cypress.env('BASE_MODULE'); const basePath = ''; @@ -23,6 +23,13 @@ describe.skip('Liquid', () => { cy.get('#mempool-block-0 > .blockLink').should('exist'); }); + it('load first mempool block after skeleton loads', () => { + cy.visit(`${basePath}`); + cy.waitForSkeletonGone(); + cy.get('#mempool-block-0 > .blockLink').click(); + cy.waitForSkeletonGone(); + }); + it('loads the dashboard', () => { cy.visit(`${basePath}`); cy.waitForSkeletonGone(); @@ -84,10 +91,11 @@ describe.skip('Liquid', () => { cy.waitForSkeletonGone(); //TODO: Change to an element id so we don't assert on a string cy.get('.table-tx-vin').should('contain', 'Peg-in'); - cy.get('.table-tx-vin a').click().then(() => { + //Remove the target=_blank attribute so the new url opens in the same tab + cy.get('.table-tx-vin a').invoke('removeAttr', 'target').click().then(() => { cy.waitForSkeletonGone(); if (baseModule === 'liquid') { - cy.url().should('eq', 'https://mempool.space/tx/f148c0d854db4174ea420655235f910543f0ec3680566dcfdf84fb0a1697b592'); + cy.url().should('eq', 'https://mempool.space/tx/f148c0d854db4174ea420655235f910543f0ec3680566dcfdf84fb0a1697b592#vout=0'); } else { //TODO: Use an environment variable to get the hostname cy.url().should('eq', 'http://localhost:4200/tx/f148c0d854db4174ea420655235f910543f0ec3680566dcfdf84fb0a1697b592'); @@ -98,7 +106,8 @@ describe.skip('Liquid', () => { it('loads peg out addresses', () => { cy.visit(`${basePath}/tx/ecf6eba04ffb3946faa172343c87162df76f1a57b07b0d6dc6ad956b13376dc8`); cy.waitForSkeletonGone(); - cy.get('.table-tx-vout a').first().click().then(() => { + //Remove the target=_blank attribute so the new url opens in the same tab + cy.get('.table-tx-vout a').first().invoke('removeAttr', 'target').click().then(() => { cy.waitForSkeletonGone(); if (baseModule === 'liquid') { cy.url().should('eq', 'https://mempool.space/address/1BxoGcMg14oaH3CwHD2hF4gU9VcfgX5yoR'); diff --git a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts index be27fa183..1f959dd3a 100644 --- a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts +++ b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts @@ -1,4 +1,4 @@ -describe.skip('Liquid Testnet', () => { +describe('Liquid Testnet', () => { const baseModule = Cypress.env('BASE_MODULE'); const basePath = '/testnet'; From 49146e140285cc9c8a53b18e9163e6c904299122 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Tue, 2 Apr 2024 06:29:43 +0000 Subject: [PATCH 12/17] Fix mainnet blocks loading bug --- frontend/src/app/components/block/block.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/components/block/block.component.ts b/frontend/src/app/components/block/block.component.ts index 8fd01340f..9e6b74baf 100644 --- a/frontend/src/app/components/block/block.component.ts +++ b/frontend/src/app/components/block/block.component.ts @@ -395,7 +395,7 @@ export class BlockComponent implements OnInit, OnDestroy { for (const txid of blockAudit.addedTxs) { isAdded[txid] = true; } - for (const txid of blockAudit.prioritizedTxs) { + for (const txid of blockAudit.prioritizedTxs || []) { isPrioritized[txid] = true; } for (const txid of blockAudit.missingTxs) { From 7b79384f277ae301bace91b60fb76023fa7a19dd Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 2 Apr 2024 15:55:35 +0900 Subject: [PATCH 13/17] Extracting i18n --- .../accelerator-dashboard.component.ts | 2 +- .../address/address-preview.component.ts | 2 +- .../master-page/master-page.component.html | 4 +- .../src/app/components/time/time.component.ts | 28 +- frontend/src/locale/messages.xlf | 2239 +++++++++++------ 5 files changed, 1546 insertions(+), 729 deletions(-) diff --git a/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts b/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts index d4df57020..1d3603739 100644 --- a/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts +++ b/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts @@ -44,7 +44,7 @@ export class AcceleratorDashboardComponent implements OnInit { @Inject(PLATFORM_ID) private platformId: Object, ) { this.webGlEnabled = this.stateService.isBrowser && detectWebGL(); - this.seoService.setTitle($localize`:@@a681a4e2011bb28157689dbaa387de0dd0aa0c11:Accelerator Dashboard`); + this.seoService.setTitle($localize`:@@6b867dc61c6a92f3229f1950f9f2d414790cce95:Accelerator Dashboard`); this.ogService.setManualOgImage('accelerator.jpg'); } diff --git a/frontend/src/app/components/address/address-preview.component.ts b/frontend/src/app/components/address/address-preview.component.ts index 4ea857b37..9bc6e967f 100644 --- a/frontend/src/app/components/address/address-preview.component.ts +++ b/frontend/src/app/components/address/address-preview.component.ts @@ -69,7 +69,7 @@ export class AddressPreviewComponent implements OnInit, OnDestroy { this.addressString = this.addressString.toLowerCase(); } this.seoService.setTitle($localize`:@@address.component.browser-title:Address: ${this.addressString}:INTERPOLATION:`); - this.seoService.setDescription($localize`:@@meta.description.bitcoin.address:See mempool transactions, confirmed transactions, balance, and more for ${this.stateService.network==='liquid'||this.stateService.network==='liquidtestnet'?'Liquid':'Bitcoin'} ${seoDescriptionNetwork(this.stateService.network)} address ${this.addressString}:INTERPOLATION:.`); + this.seoService.setDescription($localize`:@@meta.description.bitcoin.address:See mempool transactions, confirmed transactions, balance, and more for ${this.stateService.network==='liquid'||this.stateService.network==='liquidtestnet'?'Liquid':'Bitcoin'}${seoDescriptionNetwork(this.stateService.network)} address ${this.addressString}:INTERPOLATION:.`); return (this.addressString.match(/04[a-fA-F0-9]{128}|(02|03)[a-fA-F0-9]{64}/) ? this.electrsApiService.getPubKeyAddress$(this.addressString) diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index 4be038a6f..93a5fff44 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -57,10 +57,10 @@ beta - - diff --git a/frontend/src/app/components/time/time.component.ts b/frontend/src/app/components/time/time.component.ts index 954e3d157..45070ad67 100644 --- a/frontend/src/app/components/time/time.component.ts +++ b/frontend/src/app/components/time/time.component.ts @@ -211,23 +211,23 @@ export class TimeComponent implements OnInit, OnChanges, OnDestroy { case 'before': if (number === 1) { switch (unit) { // singular (1 day) - case 'year': return $localize`:@@time-span:${dateStrings.i18nYear}:DATE: before`; break; - case 'month': return $localize`:@@time-span:${dateStrings.i18nMonth}:DATE: before`; break; - case 'week': return $localize`:@@time-span:${dateStrings.i18nWeek}:DATE: before`; break; - case 'day': return $localize`:@@time-span:${dateStrings.i18nDay}:DATE: before`; break; - case 'hour': return $localize`:@@time-span:${dateStrings.i18nHour}:DATE: before`; break; - case 'minute': return $localize`:@@time-span:${dateStrings.i18nMinute}:DATE: before`; break; - case 'second': return $localize`:@@time-span:${dateStrings.i18nSecond}:DATE: before`; break; + case 'year': return $localize`:@@time-before:${dateStrings.i18nYear}:DATE: before`; break; + case 'month': return $localize`:@@time-before:${dateStrings.i18nMonth}:DATE: before`; break; + case 'week': return $localize`:@@time-before:${dateStrings.i18nWeek}:DATE: before`; break; + case 'day': return $localize`:@@time-before:${dateStrings.i18nDay}:DATE: before`; break; + case 'hour': return $localize`:@@time-before:${dateStrings.i18nHour}:DATE: before`; break; + case 'minute': return $localize`:@@time-before:${dateStrings.i18nMinute}:DATE: before`; break; + case 'second': return $localize`:@@time-before:${dateStrings.i18nSecond}:DATE: before`; break; } } else { switch (unit) { // plural (2 days) - case 'year': return $localize`:@@time-span:${dateStrings.i18nYears}:DATE: before`; break; - case 'month': return $localize`:@@time-span:${dateStrings.i18nMonths}:DATE: before`; break; - case 'week': return $localize`:@@time-span:${dateStrings.i18nWeeks}:DATE: before`; break; - case 'day': return $localize`:@@time-span:${dateStrings.i18nDays}:DATE: before`; break; - case 'hour': return $localize`:@@time-span:${dateStrings.i18nHours}:DATE: before`; break; - case 'minute': return $localize`:@@time-span:${dateStrings.i18nMinutes}:DATE: before`; break; - case 'second': return $localize`:@@time-span:${dateStrings.i18nSeconds}:DATE: before`; break; + case 'year': return $localize`:@@time-before:${dateStrings.i18nYears}:DATE: before`; break; + case 'month': return $localize`:@@time-before:${dateStrings.i18nMonths}:DATE: before`; break; + case 'week': return $localize`:@@time-before:${dateStrings.i18nWeeks}:DATE: before`; break; + case 'day': return $localize`:@@time-before:${dateStrings.i18nDays}:DATE: before`; break; + case 'hour': return $localize`:@@time-before:${dateStrings.i18nHours}:DATE: before`; break; + case 'minute': return $localize`:@@time-before:${dateStrings.i18nMinutes}:DATE: before`; break; + case 'second': return $localize`:@@time-before:${dateStrings.i18nSeconds}:DATE: before`; break; } } break; diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index 74105657d..1035a2477 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -23,13 +23,6 @@ 13 - - «« - - node_modules/src/ngb-config.ts - 13 - - Select month @@ -41,6 +34,13 @@ 13 + + «« + + node_modules/src/ngb-config.ts + 13 + + Previous month @@ -145,15 +145,15 @@ 13 - - Increment hours + + First node_modules/src/ngb-config.ts 13 - - First + + Increment hours node_modules/src/ngb-config.ts 13 @@ -236,13 +236,6 @@ 13 - - - - node_modules/src/ngb-config.ts - 13 - - Address @@ -257,6 +250,14 @@ src/app/components/address/address.component.html 3 + + src/app/components/liquid-reserves-audit/federation-addresses-list/federation-addresses-list.component.html + 8 + + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 9 + shared.address @@ -309,6 +310,10 @@ src/app/components/address/address.component.html 39 + + src/app/components/liquid-reserves-audit/federation-addresses-list/federation-addresses-list.component.html + 9 + address.balance @@ -323,15 +328,15 @@ src/app/components/block/block.component.html - 326 + 331 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 52 + 54 src/app/components/mempool-blocks/mempool-blocks.component.html - 29 + 31 shared.transaction-count.singular @@ -347,18 +352,34 @@ src/app/components/block/block.component.html - 327 + 332 src/app/components/blockchain-blocks/blockchain-blocks.component.html - 53 + 55 src/app/components/mempool-blocks/mempool-blocks.component.html - 30 + 32 shared.transaction-count.plural + + Error loading address data. + + src/app/bisq/bisq-address/bisq-address.component.html + 102 + + + src/app/components/address/address.component.html + 140 + + + src/app/components/address/address.component.html + 157 + + address.error.loading-address-data + Address: @@ -425,11 +446,11 @@ src/app/components/pool/pool.component.html - 212 + 182 src/app/components/pool/pool.component.html - 274 + 244 src/app/components/search-form/search-results/search-results.component.html @@ -496,15 +517,15 @@ src/app/components/pool/pool.component.html - 211 + 181 src/app/components/pool/pool.component.html - 273 + 243 src/app/dashboard/dashboard.component.html - 119 + 104 Bisq block height header @@ -536,15 +557,15 @@ src/app/components/block/block.component.html - 418 + 419 src/app/components/block/block.component.html - 447 + 451 src/app/components/block/block.component.html - 471 + 475 src/app/components/blocks-list/blocks-list.component.html @@ -580,7 +601,7 @@ src/app/components/master-page/master-page.component.html - 66 + 69 src/app/components/pool-ranking/pool-ranking.component.html @@ -716,7 +737,7 @@ - Explore the full Bitcoin ecosystem with The Mempool Open Source Project™. See Bisq market prices, trading activity, and more. + Explore the full Bitcoin ecosystem with The Mempool Open Source Project&reg;. See Bisq market prices, trading activity, and more. src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts 33 @@ -750,23 +771,23 @@ src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html - 52 + 64 src/app/components/mining-dashboard/mining-dashboard.component.html - 32 + 34 src/app/components/mining-dashboard/mining-dashboard.component.html + 46 + + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html 42 src/app/lightning/lightning-dashboard/lightning-dashboard.component.html - 40 - - - src/app/lightning/lightning-dashboard/lightning-dashboard.component.html - 52 + 56 dashboard.view-more @@ -878,6 +899,10 @@ src/app/bisq/bisq-stats/bisq-stats.component.html 66 + + src/app/components/liquid-reserves-audit/federation-wallet/federation-wallet.component.html + 15 + src/app/components/pool/pool.component.html 39 @@ -888,11 +913,11 @@ src/app/components/pool/pool.component.html - 351 + 321 src/app/components/pool/pool.component.html - 362 + 332 BSQ addresses @@ -945,6 +970,14 @@ src/app/bisq/bisq-trades/bisq-trades.component.html 4 + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 12 + + + src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html + 13 + src/app/components/search-form/search-results/search-results.component.html 9 @@ -962,11 +995,19 @@ src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 18 + 38 + + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 10 + + + src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html + 14 src/app/dashboard/dashboard.component.html - 157 + 134 @@ -1010,7 +1051,7 @@ src/app/components/transaction/transaction.component.html - 168 + 187 src/app/components/transactions-list/transactions-list.component.html @@ -1025,11 +1066,11 @@ src/app/components/block/block.component.html - 268 + 273 src/app/components/transaction/transaction.component.html - 320 + 339 transaction.version @@ -1047,6 +1088,10 @@ src/app/components/block-overview-tooltip/block-overview-tooltip.component.html 12 + + src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html + 12 + src/app/components/rbf-timeline/rbf-timeline-tooltip.component.html 11 @@ -1061,7 +1106,7 @@ src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html - 50 + 72 shared.transaction @@ -1086,11 +1131,11 @@ src/app/components/transaction/transaction.component.html - 145 + 163 src/app/lightning/node/node.component.html - 122 + 120 Transaction features transaction.features @@ -1125,11 +1170,11 @@ src/app/components/transaction/transaction.component.html - 286 + 305 src/app/components/transaction/transaction.component.html - 446 + 465 transaction.details @@ -1145,11 +1190,11 @@ src/app/components/transaction/transaction.component.html - 273 + 292 src/app/components/transaction/transaction.component.html - 417 + 436 Transaction inputs and outputs transaction.inputs-and-outputs @@ -1166,7 +1211,7 @@ src/app/components/transaction/transaction.component.ts - 314 + 398 @@ -1195,15 +1240,15 @@ src/app/components/transaction/transaction.component.html - 169 + 188 src/app/dashboard/dashboard.component.html - 85 + 70 src/app/dashboard/dashboard.component.html - 156 + 133 @@ -1479,7 +1524,7 @@ About src/app/components/about/about.component.ts - 47 + 49 src/app/components/bisq-master-page/bisq-master-page.component.html @@ -1491,14 +1536,14 @@ src/app/components/master-page/master-page.component.html - 75 + 78 Learn more about The Mempool Open Source Project®: enterprise sponsors, individual sponsors, integrations, who contributes, FOSS licensing, and more. src/app/components/about/about.component.ts - 48 + 50 @@ -1509,15 +1554,15 @@ src/app/components/acceleration/accelerations-list/accelerations-list.component.html - 34 + 35 src/app/components/acceleration/accelerations-list/accelerations-list.component.html - 42 + 43 src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 23 + 43 src/app/components/rbf-timeline/rbf-timeline-tooltip.component.html @@ -1529,7 +1574,7 @@ src/app/components/transaction/transaction.component.html - 515 + 534 src/app/components/transactions-list/transactions-list.component.html @@ -1650,7 +1695,11 @@ src/app/shared/components/fee-rate/fee-rate.component.html - 2 + 3 + + + src/app/shared/components/fee-rate/fee-rate.component.html + 7 sat/vB shared.sat-vbyte @@ -1663,31 +1712,22 @@ src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.ts - 69 + 75 accelerator.acceleration-fees - - Total Bid Boost - - src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.html - 32 - - - src/app/components/acceleration/acceleration-stats/acceleration-stats.component.html - 11 - - - src/app/components/acceleration/acceleration-stats/acceleration-stats.component.html - 39 - - acceleration.total-bid-boost - - - At block: + + No accelerated transaction for this timeframe src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.ts - 211 + 121 + + + + At block: + + src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.ts + 165 src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts @@ -1699,14 +1739,14 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 166 + 168 - Around block: + Around block: src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.ts - 213 + 167 src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts @@ -1718,7 +1758,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 168 + 170 @@ -1749,6 +1789,22 @@ accelerator.total-accelerated + + Total Bid Boost + + src/app/components/acceleration/acceleration-stats/acceleration-stats.component.html + 11 + + + src/app/components/acceleration/acceleration-stats/acceleration-stats.component.html + 39 + + + src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html + 56 + + accelerator.total-boost + BTC @@ -1814,6 +1870,10 @@ src/app/components/acceleration/accelerations-list/accelerations-list.component.html 14 + + src/app/components/acceleration/accelerations-list/accelerations-list.component.html + 20 + accelerator.block @@ -1853,7 +1913,7 @@ src/app/dashboard/dashboard.component.html - 88 + 73 src/app/lightning/channels-list/channels-list.component.html @@ -1866,47 +1926,22 @@ Pending src/app/components/acceleration/accelerations-list/accelerations-list.component.html - 51 + 53 accelerator.pending - - Mined + + Completed 🔄 src/app/components/acceleration/accelerations-list/accelerations-list.component.html - 52 + 54,55 - - src/app/components/pool/pool.component.html - 213 - - - src/app/components/pool/pool.component.html - 275 - - - src/app/components/rbf-list/rbf-list.component.html - 23 - - - src/app/components/rbf-timeline/rbf-timeline-tooltip.component.html - 38 - - - src/app/dashboard/dashboard.component.html - 100 - - - src/app/dashboard/dashboard.component.html - 120 - - transaction.rbf.mined - - Canceled + + Failed 🔄 src/app/components/acceleration/accelerations-list/accelerations-list.component.html - 53 + 55,56 accelerator.canceled @@ -1914,7 +1949,7 @@ There are no active accelerations src/app/components/acceleration/accelerations-list/accelerations-list.component.html - 86 + 96 accelerations.no-accelerations @@ -1922,7 +1957,7 @@ There are no recent accelerations src/app/components/acceleration/accelerations-list/accelerations-list.component.html - 87 + 97 accelerations.no-accelerations @@ -1934,7 +1969,7 @@ src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html - 72 + 74 accelerator.pending-accelerations @@ -1946,39 +1981,39 @@ accelerator.acceleration-stats - - (1 month) + + (3 months) src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html 25 - mining.144-blocks + mining.3-months + + + Mempool Goggles: Accelerations + + src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html + 41 + + dashboard.mempool-goggles-accelerations Recent Accelerations src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html - 84 + 86 dashboard.recent-accelerations - + Accelerator Dashboard src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts - 39 + 47 src/app/components/master-page/master-page.component.html - 59 - - - src/app/components/mining-dashboard/mining-dashboard.component.ts - 20 - - - src/app/shared/components/global-footer/global-footer.component.html - 42 + 57 @@ -2021,6 +2056,37 @@ accelerator.percent-of-next-block + + Balance History + + src/app/components/address-graph/address-graph.component.html + 6 + + address.balance-history + + + Balance:Balance + + src/app/components/address-graph/address-graph.component.ts + 162 + + + + Balances + + src/app/components/address-group/address-group.component.html + 4 + + addresses.balance + + + Total + + src/app/components/address-group/address-group.component.html + 9 + + addresses.total + Multisig of @@ -2048,11 +2114,11 @@ src/app/components/address/address.component.html - 153 + 167 src/app/components/amount/amount.component.html - 18 + 21 src/app/components/asset-circulation/asset-circulation.component.html @@ -2060,7 +2126,7 @@ src/app/components/asset/asset.component.html - 161 + 158 src/app/components/transaction/transaction-preview.component.html @@ -2072,11 +2138,11 @@ src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html - 58 + 98 src/app/dashboard/dashboard.component.html - 168 + 145 shared.confidential @@ -2088,49 +2154,41 @@ src/app/components/address/address.component.ts - 79 + 78 - See mempool transactions, confirmed transactions, balance, and more for address . + See mempool transactions, confirmed transactions, balance, and more for address . src/app/components/address/address-preview.component.ts 72 src/app/components/address/address.component.ts - 80 + 79 - of transaction + of transaction src/app/components/address/address.component.html - 59 + 69 X of X Address Transaction - of transactions + of transactions src/app/components/address/address.component.html - 60 + 70 X of X Address Transactions (Plural) - - Error loading address data. - - src/app/components/address/address.component.html - 129 - - address.error.loading-address-data - - There many transactions on this address, more than your backend can handle. See more on setting up a stronger backend. Consider viewing this address on the official Mempool website instead: + There many transactions on this address, more than your backend can handle. See more on setting up a stronger backend. Consider viewing this address on the official Mempool website instead: src/app/components/address/address.component.html - 134,137 + 143,146 Electrum server limit exceeded error @@ -2159,7 +2217,7 @@ src/app/lightning/node/node.component.html - 140 + 138 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html @@ -2281,9 +2339,17 @@ src/app/components/assets/assets-featured/assets-featured.component.html - 9 + 11 + + No featured assets + + src/app/components/assets/assets-featured/assets-featured.component.html + 3 + + liquid.no-featured.assets + Assets @@ -2323,19 +2389,19 @@ src/app/components/pool/pool.component.html - 148 + 122 src/app/components/pool/pool.component.html - 170 + 145 src/app/components/pool/pool.component.html - 438 + 408 src/app/components/pool/pool.component.html - 463 + 433 src/app/components/rbf-list/rbf-list.component.html @@ -2552,7 +2618,7 @@ src/app/components/block-fees-graph/block-fees-graph.component.ts - 67 + 69 src/app/components/graphs/graphs.component.html @@ -2564,30 +2630,30 @@ See the average mining fees earned per Bitcoin block visualized in BTC and USD over time. src/app/components/block-fees-graph/block-fees-graph.component.ts - 68 + 70 Indexing blocks src/app/components/block-fees-graph/block-fees-graph.component.ts - 117 + 119 src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 114 + 116 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 117 + 119 src/app/components/hashrate-chart/hashrate-chart.component.ts - 197 + 202 src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts - 167 + 201 src/app/components/indexing-progress/indexing-progress.component.html @@ -2612,6 +2678,10 @@ src/app/components/block-filters/block-filters.component.html 3 + + src/app/components/master-page/master-page.component.html + 58 + beta @@ -2648,19 +2718,19 @@ src/app/lightning/node-fee-chart/node-fee-chart.component.ts - 118 + 120 src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts - 84 + 86 src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts - 216 + 233 src/app/lightning/nodes-map/nodes-map.component.ts - 145 + 146 @@ -2678,11 +2748,77 @@ block.not-available + + Your browser does not support this feature. + + src/app/components/block-overview-graph/block-overview-graph.component.html + 21 + + webgl-disabled + + + First seen + + src/app/components/block-overview-tooltip/block-overview-tooltip.component.html + 20 + + + src/app/components/block-overview-tooltip/block-overview-tooltip.component.html + 24 + + + src/app/components/block-overview-tooltip/block-overview-tooltip.component.html + 28 + + + src/app/components/rbf-timeline/rbf-timeline-tooltip.component.html + 17 + + + src/app/components/transaction/transaction.component.html + 130 + + + src/app/lightning/node/node.component.html + 74 + + + src/app/lightning/nodes-per-country/nodes-per-country.component.html + 61 + + + src/app/lightning/nodes-per-isp/nodes-per-isp.component.html + 58 + + + src/app/lightning/nodes-ranking/oldest-nodes/oldest-nodes.component.html + 11 + + + src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html + 15 + + + src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html + 15 + + Transaction first seen + transaction.first-seen + + + Confirmed + + src/app/components/block-overview-tooltip/block-overview-tooltip.component.html + 32 + + Transaction confirmed after + transaction.confirmed-after + Fee src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 22 + 42 src/app/components/rbf-timeline/rbf-timeline-tooltip.component.html @@ -2694,7 +2830,7 @@ src/app/components/transaction/transaction.component.html - 514 + 533 src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html @@ -2702,7 +2838,7 @@ src/app/dashboard/dashboard.component.html - 159 + 136 Transaction fee transaction.fee @@ -2711,15 +2847,15 @@ Fee rate src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 26 + 46 src/app/components/transaction/transaction.component.html - 172 + 191 src/app/components/transaction/transaction.component.html - 518 + 537 src/app/lightning/channel/channel-box/channel-box.component.html @@ -2740,11 +2876,11 @@ Effective fee rate src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 32 + 52 src/app/components/transaction/transaction.component.html - 529 + 548 Effective transaction fee rate transaction.effective-fee-rate @@ -2753,7 +2889,7 @@ Accelerated fee rate src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 33 + 53 Effective transaction fee rate transaction.effective-fee-rate @@ -2762,7 +2898,7 @@ Virtual size src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 39 + 59 src/app/components/rbf-timeline/rbf-timeline-tooltip.component.html @@ -2770,11 +2906,11 @@ src/app/components/transaction/transaction.component.html - 170 + 189 src/app/components/transaction/transaction.component.html - 298 + 317 Transaction Virtual Size transaction.vsize @@ -2783,7 +2919,7 @@ Weight src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 43 + 63 src/app/components/rbf-timeline/rbf-timeline-tooltip.component.html @@ -2791,7 +2927,7 @@ src/app/components/transaction/transaction.component.html - 171 + 190 Transaction Weight transaction.weight @@ -2800,7 +2936,7 @@ Audit status src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 47 + 67 transaction.audit-status @@ -2808,7 +2944,7 @@ Match src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 49 + 70 transaction.audit.match @@ -2816,7 +2952,7 @@ Removed src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 50 + 71 transaction.audit.removed @@ -2824,11 +2960,11 @@ Marginal fee rate src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 51 + 72 src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 56 + 78 transaction.audit.marginal @@ -2836,7 +2972,7 @@ High sigop count src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 52 + 73 transaction.audit.sigop @@ -2844,7 +2980,7 @@ Recently broadcasted src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 53 + 74 transaction.audit.recently-broadcasted @@ -2852,7 +2988,7 @@ Recently CPFP'd src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 54 + 75 transaction.audit.recently-cpfped @@ -2860,15 +2996,23 @@ Added src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 55 + 76 transaction.audit.added + + Prioritized + + src/app/components/block-overview-tooltip/block-overview-tooltip.component.html + 77 + + transaction.audit.prioritized + Conflicting src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 57 + 79 transaction.audit.conflicting @@ -2876,15 +3020,15 @@ Accelerated src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 58 + 80 src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 63 + 88 src/app/components/transaction/transaction.component.html - 539 + 583 transaction.audit.accelerated @@ -2896,7 +3040,7 @@ src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 65 + 67 src/app/components/graphs/graphs.component.html @@ -2908,7 +3052,7 @@ See Bitcoin block rewards in BTC and USD visualized over time. Block rewards are the total funds miners earn from the block subsidy and fees. src/app/components/block-rewards-graph/block-rewards-graph.component.ts - 66 + 68 @@ -2919,7 +3063,7 @@ src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 62 + 64 src/app/components/graphs/graphs.component.html @@ -2931,18 +3075,18 @@ See Bitcoin block sizes (MB) and block weights (weight units) visualized over time. src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 63 + 65 Size src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 185 + 187 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 240 + 242 src/app/components/block/block.component.html @@ -2966,30 +3110,30 @@ src/app/components/pool/pool.component.html - 219 + 189 src/app/components/pool/pool.component.html - 280 + 250 src/app/components/transaction/transaction.component.html - 294 + 313 src/app/dashboard/dashboard.component.html - 123 + 107 Weight src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 193 + 195 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 271 + 273 src/app/components/block/block-preview.component.html @@ -3001,30 +3145,30 @@ src/app/components/block/block.component.html - 414 + 415 src/app/components/block/block.component.html - 438 + 442 src/app/components/block/block.component.html - 467 + 471 src/app/components/transaction/transaction.component.html - 310 + 329 Size per weight src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 201 + 203 src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts - 283 + 285 @@ -3035,11 +3179,11 @@ src/app/components/block/block-preview.component.ts - 100 + 102 src/app/components/block/block.component.ts - 265 + 279 @@ -3050,11 +3194,11 @@ src/app/components/block/block-preview.component.ts - 102 + 104 src/app/components/block/block.component.ts - 267 + 281 @@ -3065,11 +3209,11 @@ src/app/components/block/block-preview.component.ts - 104 + 106 src/app/components/block/block.component.ts - 269 + 283 @@ -3080,7 +3224,7 @@ src/app/components/block/block.component.html - 133 + 136 src/app/components/mempool-block/mempool-block.component.html @@ -3096,23 +3240,23 @@ src/app/components/block/block.component.html - 144 + 147 src/app/components/block/block.component.html - 170 + 173 src/app/components/block/block.component.html - 408 + 409 src/app/components/block/block.component.html - 429 + 430 src/app/components/block/block.component.html - 463 + 467 src/app/components/mempool-block/mempool-block.component.html @@ -3129,7 +3273,11 @@ src/app/components/block/block.component.html - 179 + 182 + + + src/app/components/transaction/transaction.component.html + 562 block.miner @@ -3154,7 +3302,7 @@ src/app/components/mempool-block/mempool-block.component.ts - 84 + 87 Next Block @@ -3191,7 +3339,7 @@ src/app/components/pool/pool.component.html - 215 + 185 latest-blocks.health @@ -3211,15 +3359,11 @@ src/app/components/pool/pool.component.html - 107 + 106 src/app/components/pool/pool.component.html - 132 - - - src/app/components/pool/pool.component.html - 248 + 218 src/app/lightning/channel/closing-type/closing-type.component.ts @@ -3231,19 +3375,19 @@ src/app/lightning/node/node.component.html - 58 + 56 src/app/lightning/node/node.component.html - 105 + 103 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts - 143 + 154 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts - 312 + 323 unknown @@ -3251,7 +3395,7 @@ Fee span src/app/components/block/block.component.html - 129 + 132 src/app/components/mempool-block/mempool-block.component.html @@ -3263,7 +3407,7 @@ Based on average native segwit transaction of 140 vBytes src/app/components/block/block.component.html - 137 + 140 src/app/components/fees-box/fees-box.component.html @@ -3291,11 +3435,11 @@ Subsidy + fees src/app/components/block/block.component.html - 159 + 162 src/app/components/block/block.component.html - 174 + 177 Total subsidy and fees in a block block.subsidy-and-fees @@ -3304,7 +3448,7 @@ Expected src/app/components/block/block.component.html - 222 + 225 block.expected @@ -3312,7 +3456,7 @@ Actual src/app/components/block/block.component.html - 224 + 227 block.actual @@ -3320,7 +3464,7 @@ Expected Block src/app/components/block/block.component.html - 228 + 231 block.expected-block @@ -3328,7 +3472,7 @@ Actual Block src/app/components/block/block.component.html - 242 + 246 block.actual-block @@ -3336,7 +3480,7 @@ Taproot src/app/components/block/block.component.html - 269 + 274 src/app/components/tx-features/tx-features.component.html @@ -3365,7 +3509,7 @@ Bits src/app/components/block/block.component.html - 272 + 277 block.bits @@ -3373,7 +3517,7 @@ Merkle root src/app/components/block/block.component.html - 276 + 281 block.merkle-root @@ -3381,7 +3525,7 @@ Difficulty src/app/components/block/block.component.html - 287 + 292 src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html @@ -3397,11 +3541,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 304 + 310 src/app/components/hashrate-chart/hashrate-chart.component.ts - 391 + 407 block.difficulty @@ -3409,7 +3553,7 @@ Nonce src/app/components/block/block.component.html - 291 + 296 block.nonce @@ -3417,7 +3561,7 @@ Block Header Hex src/app/components/block/block.component.html - 295 + 300 block.header @@ -3425,7 +3569,7 @@ Audit src/app/components/block/block.component.html - 313 + 318 Toggle Audit block.toggle-audit @@ -3434,11 +3578,11 @@ Details src/app/components/block/block.component.html - 320 + 325 src/app/components/transaction/transaction.component.html - 278 + 297 src/app/lightning/channel/channel.component.html @@ -3454,11 +3598,11 @@ src/app/lightning/node/node.component.html - 125 + 123 src/app/lightning/node/node.component.html - 266 + 264 Transaction Details transaction.details @@ -3467,11 +3611,11 @@ Error loading data. src/app/components/block/block.component.html - 339 + 344 src/app/components/block/block.component.html - 378 + 381 src/app/lightning/channel/channel-preview.component.html @@ -3491,10 +3635,18 @@ Why is this block empty? src/app/components/block/block.component.html - 400 + 401 block.empty-block-explanation + + Acceleration fees paid out-of-band + + src/app/components/block/block.component.html + 433 + + Acceleration Fees + Pool @@ -3509,10 +3661,6 @@ src/app/components/pool-ranking/pool-ranking.component.html 92 - - src/app/dashboard/dashboard.component.html - 121 - mining.pool-name @@ -3527,27 +3675,23 @@ src/app/components/pool/pool.component.html - 95 + 94 src/app/components/pool/pool.component.html - 120 + 186 src/app/components/pool/pool.component.html - 216 + 247 src/app/components/pool/pool.component.html - 277 + 355 src/app/components/pool/pool.component.html - 385 - - - src/app/components/pool/pool.component.html - 410 + 380 latest-blocks.reward @@ -3559,11 +3703,11 @@ src/app/components/pool/pool.component.html - 217 + 187 src/app/components/pool/pool.component.html - 278 + 248 latest-blocks.fees @@ -3579,19 +3723,19 @@ src/app/components/pool/pool.component.html - 218 + 188 src/app/components/pool/pool.component.html - 279 + 249 src/app/dashboard/dashboard.component.html - 122 + 106 src/app/dashboard/dashboard.component.html - 254 + 283 dashboard.txs @@ -3599,21 +3743,21 @@ Blocks src/app/components/blocks-list/blocks-list.component.ts - 59 + 101 See the most recent Liquid blocks along with basic stats such as block height, block size, and more. src/app/components/blocks-list/blocks-list.component.ts - 62 + 105 See the most recent Bitcoin blocks along with basic stats such as block height, block reward, block size, and more. src/app/components/blocks-list/blocks-list.component.ts - 64 + 107 @@ -3659,7 +3803,7 @@ src/app/dashboard/dashboard.component.html - 258 + 287 Memory usage dashboard.memory-usage @@ -3676,7 +3820,7 @@ src/app/dashboard/dashboard.component.html - 252 + 281 Unconfirmed count dashboard.unconfirmed @@ -3721,7 +3865,7 @@ src/app/components/difficulty-mining/difficulty-mining.component.html - 67 + 74 difficulty-box.remaining @@ -3734,7 +3878,7 @@ src/app/components/difficulty-mining/difficulty-mining.component.html - 54,55 + 67,68 src/app/components/footer/footer.component.html @@ -3742,7 +3886,7 @@ src/app/components/mempool-blocks/mempool-blocks.component.html - 43,44 + 45,46 src/app/lightning/channel/channel-box/channel-box.component.html @@ -3759,7 +3903,7 @@ src/app/components/difficulty-mining/difficulty-mining.component.html - 55,56 + 68,69 src/app/components/footer/footer.component.html @@ -3775,7 +3919,7 @@ src/app/components/difficulty-mining/difficulty-mining.component.html - 74 + 81 difficulty-box.estimate @@ -3783,11 +3927,11 @@ Previous src/app/components/difficulty-mining/difficulty-mining.component.html - 31 + 28 src/app/components/difficulty/difficulty.component.html - 59 + 64 difficulty-box.previous @@ -3795,7 +3939,7 @@ Current Period src/app/components/difficulty-mining/difficulty-mining.component.html - 43 + 40 difficulty-box.current-period @@ -3803,15 +3947,11 @@ Next Halving src/app/components/difficulty-mining/difficulty-mining.component.html - 51 + 47 src/app/components/difficulty-mining/difficulty-mining.component.html - 51 - - - src/app/components/difficulty-mining/difficulty-mining.component.html - 81 + 88 difficulty-box.next-halving @@ -3895,14 +4035,62 @@ difficulty-box.block-behind + + Halving Countdown + + src/app/components/difficulty/difficulty.component.html + 2 + + dashboard.halving-countdown + + + difficulty + + src/app/components/difficulty/difficulty.component.html + 7 + + statistics.average-small + + + halving + + src/app/components/difficulty/difficulty.component.html + 10 + + statistics.median-small + Average block time src/app/components/difficulty/difficulty.component.html - 42 + 50 difficulty-box.average-block-time + + New subsidy + + src/app/components/difficulty/difficulty.component.html + 103 + + difficulty-box.new-subsidy + + + Blocks remaining + + src/app/components/difficulty/difficulty.component.html + 111 + + shared.blocks-remaining + + + Block remaining + + src/app/components/difficulty/difficulty.component.html + 112 + + shared.block-remaining + Either 2x the minimum, or the Low Priority rate (whichever is lower) @@ -3985,10 +4173,6 @@ src/app/components/footer/footer.component.html 8 - - src/app/dashboard/dashboard.component.html - 284 - dashboard.backend-is-synchronizing @@ -3997,10 +4181,6 @@ src/app/components/footer/footer.component.html 13 - - src/app/dashboard/dashboard.component.html - 289 - vB/s shared.vbytes-per-second @@ -4010,10 +4190,6 @@ src/app/components/footer/footer.component.html 14 - - src/app/dashboard/dashboard.component.html - 290 - WU/s shared.weight-per-second @@ -4086,11 +4262,11 @@ src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts - 67 + 73 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts - 132 + 143 lightning.nodes-networks @@ -4106,11 +4282,11 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts - 66 + 70 src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts - 123 + 133 lightning.network-capacity @@ -4122,7 +4298,7 @@ src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 52 + 53 lightning.nodes-per-isp @@ -4154,7 +4330,7 @@ src/app/lightning/nodes-map/nodes-map.component.ts - 50 + 51 lightning.lightning.nodes-heatmap @@ -4166,7 +4342,7 @@ src/app/lightning/nodes-channels-map/nodes-channels-map.component.html - 19 + 20 lightning.nodes-channels-world-map @@ -4182,11 +4358,11 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 293 + 299 src/app/components/hashrate-chart/hashrate-chart.component.ts - 379 + 395 src/app/components/pool-ranking/pool-ranking.component.html @@ -4206,7 +4382,7 @@ src/app/components/hashrate-chart/hashrate-chart.component.ts - 74 + 75 mining.hashrate-difficulty @@ -4214,25 +4390,25 @@ See hashrate and difficulty for the Bitcoin network visualized over time. src/app/components/hashrate-chart/hashrate-chart.component.ts - 75 + 76 Hashrate (MA) src/app/components/hashrate-chart/hashrate-chart.component.ts - 312 + 318 src/app/components/hashrate-chart/hashrate-chart.component.ts - 402 + 418 Pools Historical Dominance src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts - 64 + 74 @@ -4257,7 +4433,7 @@ src/app/components/master-page/master-page.component.html - 69 + 72 src/app/components/statistics/statistics.component.ts @@ -4265,23 +4441,351 @@ master-page.graphs - - Accelerator Dashboard + + Non-Dust Expired - src/app/components/master-page/master-page.component.html - 56 + src/app/components/liquid-reserves-audit/expired-utxos-stats/expired-utxos-stats.component.html + 3 - master-page.accelerator-dashboard + liquid.non-dust-expired - - Lightning Explorer + + Total amount of BTC held in non-dust Federation UTXOs that have expired timelocks + + src/app/components/liquid-reserves-audit/expired-utxos-stats/expired-utxos-stats.component.html + 5 + + liquid.expired-utxos-non-dust + + + UTXOs + + src/app/components/liquid-reserves-audit/expired-utxos-stats/expired-utxos-stats.component.html + 6 + + + src/app/components/liquid-reserves-audit/expired-utxos-stats/expired-utxos-stats.component.html + 16 + + + src/app/components/liquid-reserves-audit/federation-addresses-stats/federation-addresses-stats.component.html + 9 + + shared.utxos + + + Total Expired + + src/app/components/liquid-reserves-audit/expired-utxos-stats/expired-utxos-stats.component.html + 12 + + liquid.total-expired + + + Total amount of BTC held in Federation UTXOs that have expired timelocks + + src/app/components/liquid-reserves-audit/expired-utxos-stats/expired-utxos-stats.component.html + 15 + + liquid.expired-utxos + + + Liquid Federation Wallet + + src/app/components/liquid-reserves-audit/federation-addresses-stats/federation-addresses-stats.component.html + 5 + + + src/app/components/liquid-reserves-audit/federation-addresses-stats/federation-addresses-stats.component.html + 19 + + + src/app/components/liquid-reserves-audit/federation-wallet/federation-wallet.component.html + 3 + + + src/app/components/liquid-reserves-audit/federation-wallet/federation-wallet.component.ts + 14 + + liquid.federation-wallet + + + addresses + + src/app/components/liquid-reserves-audit/federation-addresses-stats/federation-addresses-stats.component.html + 8 + + shared.addresses + + + Output + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 8 + + + src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html + 43 + + + src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html + 76 + + transaction.output + + + Related Peg-In + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 11 + + liquid.related-peg-in + + + Expires in + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 13 + + liquid.expires-in + + + Expired since + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 14 + + liquid.expired-since + + + Is Dust + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 15 + + liquid.is-dust + + + Change output + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 55 + + liquid.change-output + + + blocks + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 63 + + shared.blocks + + + Yes + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 66 + + shared.yes + + + No + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 67 + + shared.no + + + Timelock-Expired UTXOs + + src/app/components/liquid-reserves-audit/federation-wallet/federation-wallet.component.html + 12 + + liquid.timelock-expired-utxos + + + Recent Peg-In / Out's + + src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html + 4 + + + src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.ts + 66 + + + src/app/components/liquid-reserves-audit/recent-pegs-stats/recent-pegs-stats.component.html + 5 + + + src/app/components/liquid-reserves-audit/recent-pegs-stats/recent-pegs-stats.component.html + 29 + + liquid.recent-pegs + + + Fund / Redemption Tx + + src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html + 15 + + liquid.fund-redemption-tx + + + BTC Address + + src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html + 16 + + liquid.bitcoin-address + + + Peg out in progress... + + src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html + 70 + + liquid.redemption-in-progress + + + 24h Peg-In Volume + + src/app/components/liquid-reserves-audit/recent-pegs-stats/recent-pegs-stats.component.html + 12 + + liquid.peg-ins-volume-day + + + BTC + + src/app/components/liquid-reserves-audit/recent-pegs-stats/recent-pegs-stats.component.html + 12 + + + src/app/components/liquid-reserves-audit/recent-pegs-stats/recent-pegs-stats.component.html + 18 + + shared.addresses + + + Peg-Ins + + src/app/components/liquid-reserves-audit/recent-pegs-stats/recent-pegs-stats.component.html + 13 + + liquid.peg-ins + + + 24h Peg-Out Volume + + src/app/components/liquid-reserves-audit/recent-pegs-stats/recent-pegs-stats.component.html + 18 + + liquid.peg-out-volume-day + + + Peg-Outs + + src/app/components/liquid-reserves-audit/recent-pegs-stats/recent-pegs-stats.component.html + 19 + + liquid.peg-outs + + + Unpeg + + src/app/components/liquid-reserves-audit/reserves-ratio-stats/reserves-ratio-stats.component.html + 3 + + liquid.unpeg + + + Unpeg Event + + src/app/components/liquid-reserves-audit/reserves-ratio-stats/reserves-ratio-stats.component.html + 7 + + liquid.unpeg-event + + + Avg Peg Ratio + + src/app/components/liquid-reserves-audit/reserves-ratio-stats/reserves-ratio-stats.component.html + 14 + + liquid.avg-peg-ratio + + + Emergency Keys + + src/app/components/liquid-reserves-audit/reserves-ratio-stats/reserves-ratio-stats.component.html + 28 + + liquid.emergency-keys + + + usage + + src/app/components/liquid-reserves-audit/reserves-ratio-stats/reserves-ratio-stats.component.html + 31 + + shared.usage + + + L-BTC in circulation + + src/app/components/liquid-reserves-audit/reserves-supply-stats/reserves-supply-stats.component.html + 3 + + dashboard.lbtc-pegs-in-circulation + + + As of block + + src/app/components/liquid-reserves-audit/reserves-supply-stats/reserves-supply-stats.component.html + 7 + + + src/app/components/liquid-reserves-audit/reserves-supply-stats/reserves-supply-stats.component.html + 16 + + shared.as-of-block + + + BTC Holdings + + src/app/components/liquid-reserves-audit/reserves-supply-stats/reserves-supply-stats.component.html + 12 + + dashboard.btc-holdings + + + Mining Dashboard src/app/components/master-page/master-page.component.html 62 + + src/app/components/mining-dashboard/mining-dashboard.component.ts + 24 + + + src/app/shared/components/global-footer/global-footer.component.html + 42 + + mining.mining-dashboard + + + Lightning Explorer + + src/app/components/master-page/master-page.component.html + 65 + src/app/lightning/lightning-dashboard/lightning-dashboard.component.ts - 27 + 33 src/app/shared/components/global-footer/global-footer.component.html @@ -4293,7 +4797,7 @@ Documentation src/app/components/master-page/master-page.component.html - 72 + 75 src/app/docs/docs/docs.component.html @@ -4305,21 +4809,21 @@ See stats for transactions in the mempool: fee range, aggregate size, and more. Mempool blocks are updated in real-time as the network receives new transactions. src/app/components/mempool-block/mempool-block.component.ts - 59 + 62 Stack of mempool blocks src/app/components/mempool-block/mempool-block.component.ts - 86 + 89 Mempool block src/app/components/mempool-block/mempool-block.component.ts - 88 + 91 @@ -4351,7 +4855,7 @@ Sign in src/app/components/menu/menu.component.html - 10 + 21 shared.sign-in @@ -4375,11 +4879,11 @@ Recent Blocks src/app/components/mining-dashboard/mining-dashboard.component.html - 52 + 56 src/app/dashboard/dashboard.component.html - 113 + 98 src/app/shared/components/global-footer/global-footer.component.html @@ -4391,7 +4895,7 @@ Adjustments src/app/components/mining-dashboard/mining-dashboard.component.html - 66 + 70 dashboard.adjustments @@ -4399,7 +4903,7 @@ Get real-time Bitcoin mining stats like hashrate, difficulty adjustment, block rewards, pool dominance, and more. src/app/components/mining-dashboard/mining-dashboard.component.ts - 21 + 25 @@ -4494,7 +4998,7 @@ src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html - 57 + 53 mining.rank @@ -4510,19 +5014,15 @@ src/app/components/pool/pool.component.html - 97 + 96 src/app/components/pool/pool.component.html - 122 + 357 src/app/components/pool/pool.component.html - 387 - - - src/app/components/pool/pool.component.html - 412 + 382 latest-blocks.avg_health @@ -4566,44 +5066,44 @@ Mining Pools src/app/components/pool-ranking/pool-ranking.component.ts - 58 + 59 See the top Bitcoin mining pools ranked by number of blocks mined, over your desired timeframe. src/app/components/pool-ranking/pool-ranking.component.ts - 59 + 60 blocks src/app/components/pool-ranking/pool-ranking.component.ts - 166 + 167 src/app/components/pool-ranking/pool-ranking.component.ts - 169 + 170 src/app/components/pool-ranking/pool-ranking.component.ts - 204 + 205 src/app/components/pool-ranking/pool-ranking.component.ts - 207 + 208 Other () src/app/components/pool-ranking/pool-ranking.component.ts - 202 + 203 src/app/components/pool-ranking/pool-ranking.component.ts - 206 + 207 src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts @@ -4615,11 +5115,11 @@ src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 176 + 177 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 193 + 194 @@ -4646,11 +5146,11 @@ src/app/components/pool/pool.component.html - 334 + 304 src/app/components/pool/pool.component.html - 342 + 312 mining.tags @@ -4662,7 +5162,7 @@ src/app/components/pool/pool.component.ts - 86 + 94 @@ -4705,19 +5205,15 @@ Hashrate (24h) src/app/components/pool/pool.component.html - 96 + 95 src/app/components/pool/pool.component.html - 121 + 356 src/app/components/pool/pool.component.html - 386 - - - src/app/components/pool/pool.component.html - 411 + 381 mining.hashrate @@ -4725,19 +5221,15 @@ Blocks (24h) src/app/components/pool/pool.component.html - 146 + 120 src/app/components/pool/pool.component.html - 168 + 406 src/app/components/pool/pool.component.html - 436 - - - src/app/components/pool/pool.component.html - 461 + 431 24h @@ -4745,31 +5237,71 @@ 1w src/app/components/pool/pool.component.html - 147 + 121 src/app/components/pool/pool.component.html - 169 + 407 src/app/components/pool/pool.component.html - 437 - - - src/app/components/pool/pool.component.html - 462 + 432 1w + + Out-of-band Fees (1w) + + src/app/components/pool/pool.component.html + 143 + + 1w + + + 1m + + src/app/components/pool/pool.component.html + 144 + + 1m + + + Mined + + src/app/components/pool/pool.component.html + 183 + + + src/app/components/pool/pool.component.html + 245 + + + src/app/components/rbf-list/rbf-list.component.html + 23 + + + src/app/components/rbf-timeline/rbf-timeline-tooltip.component.html + 38 + + + src/app/dashboard/dashboard.component.html + 85 + + + src/app/dashboard/dashboard.component.html + 105 + + latest-blocks.mined + Coinbase tag src/app/components/pool/pool.component.html - 214 + 184 src/app/components/pool/pool.component.html - 276 + 246 latest-blocks.coinbasetag @@ -4777,9 +5309,33 @@ Not enough data yet src/app/components/pool/pool.component.ts - 124 + 143 + + Hashrate + + src/app/components/pool/pool.component.ts + 212 + + + src/app/components/pool/pool.component.ts + 266 + + mining.hashrate + + + Pool Dominance + + src/app/components/pool/pool.component.ts + 223 + + + src/app/components/pool/pool.component.ts + 277 + + mining.pool-dominance + Broadcast Transaction @@ -4805,7 +5361,7 @@ src/app/components/transaction/transaction.component.html - 336 + 355 transaction.hex @@ -4813,14 +5369,14 @@ Broadcast Transaction src/app/components/push-transaction/push-transaction.component.ts - 31 + 33 Broadcast a transaction to the network using the transaction's hash. src/app/components/push-transaction/push-transaction.component.ts - 32 + 34 @@ -4831,7 +5387,7 @@ src/app/components/rbf-list/rbf-list.component.ts - 58 + 60 page.rbf-replacements @@ -4847,7 +5403,7 @@ src/app/dashboard/dashboard.component.html - 101 + 86 transaction.full-rbf @@ -4863,45 +5419,8 @@ See the most recent RBF replacements on the Bitcoin network, updated in real-time. src/app/components/rbf-list/rbf-list.component.ts - 59 - - - - First seen - - src/app/components/rbf-timeline/rbf-timeline-tooltip.component.html - 17 - - - src/app/components/transaction/transaction.component.html - 112 - - - src/app/lightning/node/node.component.html - 76 - - - src/app/lightning/nodes-per-country/nodes-per-country.component.html 61 - - src/app/lightning/nodes-per-isp/nodes-per-isp.component.html - 58 - - - src/app/lightning/nodes-ranking/oldest-nodes/oldest-nodes.component.html - 11 - - - src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html - 15 - - - src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html - 15 - - Transaction first seen - transaction.first-seen RBF @@ -4928,7 +5447,7 @@ src/app/dashboard/dashboard.component.html - 102 + 87 RBF tx-features.tag.rbf @@ -4941,7 +5460,7 @@ src/app/components/transaction/transaction.component.html - 257 + 276 src/app/components/transactions-list/transactions-list.component.html @@ -5059,32 +5578,32 @@ search-form.search-title - - Bitcoin Block Height + + Block Height src/app/components/search-form/search-results/search-results.component.html 3 search.bitcoin-block-height - - Bitcoin Transaction + + Transaction src/app/components/search-form/search-results/search-results.component.html 21 search.bitcoin-transaction - - Bitcoin Address + + Address src/app/components/search-form/search-results/search-results.component.html 27 search.bitcoin-address - - Bitcoin Block + + Block src/app/components/search-form/search-results/search-results.component.html 33 @@ -5099,8 +5618,8 @@ search.other-networks - - Bitcoin Addresses + + Addresses src/app/components/search-form/search-results/search-results.component.html 47 @@ -5123,11 +5642,19 @@ search.lightning-channels + + Liquid Asset + + src/app/components/search-form/search-results/search-results.component.html + 71 + + search.liquid-asset + Go to "" src/app/components/search-form/search-results/search-results.component.html - 72 + 78 search.go-to @@ -5209,90 +5736,22 @@ 40 - - Just now + + Immediately src/app/components/time/time.component.ts 90 - - ago + + Just now src/app/components/time/time.component.ts - 118 - - - src/app/components/time/time.component.ts - 119 - - - src/app/components/time/time.component.ts - 120 - - - src/app/components/time/time.component.ts - 121 - - - src/app/components/time/time.component.ts - 122 - - - src/app/components/time/time.component.ts - 123 - - - src/app/components/time/time.component.ts - 124 - - - src/app/components/time/time.component.ts - 128 - - - src/app/components/time/time.component.ts - 129 - - - src/app/components/time/time.component.ts - 130 - - - src/app/components/time/time.component.ts - 131 - - - src/app/components/time/time.component.ts - 132 - - - src/app/components/time/time.component.ts - 133 - - - src/app/components/time/time.component.ts - 134 + 93 - - In ~ - - src/app/components/time/time.component.ts - 141 - - - src/app/components/time/time.component.ts - 142 - - - src/app/components/time/time.component.ts - 143 - - - src/app/components/time/time.component.ts - 144 - + + ago src/app/components/time/time.component.ts 145 @@ -5305,22 +5764,22 @@ src/app/components/time/time.component.ts 147 + + src/app/components/time/time.component.ts + 148 + + + src/app/components/time/time.component.ts + 149 + + + src/app/components/time/time.component.ts + 150 + src/app/components/time/time.component.ts 151 - - src/app/components/time/time.component.ts - 152 - - - src/app/components/time/time.component.ts - 153 - - - src/app/components/time/time.component.ts - 154 - src/app/components/time/time.component.ts 155 @@ -5333,25 +5792,25 @@ src/app/components/time/time.component.ts 157 + + src/app/components/time/time.component.ts + 158 + + + src/app/components/time/time.component.ts + 159 + + + src/app/components/time/time.component.ts + 160 + + + src/app/components/time/time.component.ts + 161 + - - After - - src/app/components/time/time.component.ts - 164 - - - src/app/components/time/time.component.ts - 165 - - - src/app/components/time/time.component.ts - 166 - - - src/app/components/time/time.component.ts - 167 - + + In ~ src/app/components/time/time.component.ts 168 @@ -5364,22 +5823,22 @@ src/app/components/time/time.component.ts 170 + + src/app/components/time/time.component.ts + 171 + + + src/app/components/time/time.component.ts + 172 + + + src/app/components/time/time.component.ts + 173 + src/app/components/time/time.component.ts 174 - - src/app/components/time/time.component.ts - 175 - - - src/app/components/time/time.component.ts - 176 - - - src/app/components/time/time.component.ts - 177 - src/app/components/time/time.component.ts 178 @@ -5392,6 +5851,140 @@ src/app/components/time/time.component.ts 180 + + src/app/components/time/time.component.ts + 181 + + + src/app/components/time/time.component.ts + 182 + + + src/app/components/time/time.component.ts + 183 + + + src/app/components/time/time.component.ts + 184 + + + + After + + src/app/components/time/time.component.ts + 191 + + + src/app/components/time/time.component.ts + 192 + + + src/app/components/time/time.component.ts + 193 + + + src/app/components/time/time.component.ts + 194 + + + src/app/components/time/time.component.ts + 195 + + + src/app/components/time/time.component.ts + 196 + + + src/app/components/time/time.component.ts + 197 + + + src/app/components/time/time.component.ts + 201 + + + src/app/components/time/time.component.ts + 202 + + + src/app/components/time/time.component.ts + 203 + + + src/app/components/time/time.component.ts + 204 + + + src/app/components/time/time.component.ts + 205 + + + src/app/components/time/time.component.ts + 206 + + + src/app/components/time/time.component.ts + 207 + + + + before + + src/app/components/time/time.component.ts + 214 + + + src/app/components/time/time.component.ts + 215 + + + src/app/components/time/time.component.ts + 216 + + + src/app/components/time/time.component.ts + 217 + + + src/app/components/time/time.component.ts + 218 + + + src/app/components/time/time.component.ts + 219 + + + src/app/components/time/time.component.ts + 220 + + + src/app/components/time/time.component.ts + 224 + + + src/app/components/time/time.component.ts + 225 + + + src/app/components/time/time.component.ts + 226 + + + src/app/components/time/time.component.ts + 227 + + + src/app/components/time/time.component.ts + 228 + + + src/app/components/time/time.component.ts + 229 + + + src/app/components/time/time.component.ts + 230 + Coinbase @@ -5417,7 +6010,7 @@ src/app/components/transaction/transaction.component.ts - 318 + 402 @@ -5429,11 +6022,130 @@ RBF replacement transaction.rbf.replacement + + Audit + + src/app/components/transaction/transaction.component.html + 74 + + transaction.audit + + + Coinbase + + src/app/components/transaction/transaction.component.html + 77 + + Coinbase + tx-features.tag.coinbase + + + This transaction was projected to be included in the block + + src/app/components/transaction/transaction.component.html + 78 + + Expected in block tooltip + + + Expected in Block + + src/app/components/transaction/transaction.component.html + 78 + + Expected in Block + tx-features.tag.expected + + + This transaction was seen in the mempool prior to mining + + src/app/components/transaction/transaction.component.html + 79 + + Seen in mempool tooltip + + + Seen in Mempool + + src/app/components/transaction/transaction.component.html + 79 + + Seen in Mempool + tx-features.tag.seen + + + This transaction was missing from our mempool prior to mining + + src/app/components/transaction/transaction.component.html + 80 + + Not seen in mempool tooltip + + + Not seen in Mempool + + src/app/components/transaction/transaction.component.html + 80 + + Not seen in Mempool + tx-features.tag.not-seen + + + This transaction may have been added out-of-band + + src/app/components/transaction/transaction.component.html + 81 + + Added transaction tooltip + + + Added + + src/app/components/transaction/transaction.component.html + 81 + + Added + tx-features.tag.added + + + This transaction may have been prioritized out-of-band + + src/app/components/transaction/transaction.component.html + 82 + + Prioritized transaction tooltip + + + Prioritized + + src/app/components/transaction/transaction.component.html + 82 + + Prioritized + tx-features.tag.prioritized + + + This transaction conflicted with another version in our mempool + + src/app/components/transaction/transaction.component.html + 83 + + Conflict in mempool tooltip + + + Conflict + + src/app/components/transaction/transaction.component.html + 83 + + Conflict + tx-features.tag.conflict + Hide accelerator src/app/components/transaction/transaction.component.html - 90 + 108 hide-accelerator @@ -5441,7 +6153,7 @@ ETA src/app/components/transaction/transaction.component.html - 118 + 136 Transaction ETA transaction.eta @@ -5450,7 +6162,7 @@ In several hours (or more) src/app/components/transaction/transaction.component.html - 126 + 144 Transaction ETA in several hours or more transaction.eta.in-several-hours @@ -5459,11 +6171,11 @@ Accelerate src/app/components/transaction/transaction.component.html - 127 + 145 src/app/components/transaction/transaction.component.html - 137 + 155 Accelerate button label transaction.accelerate @@ -5472,11 +6184,11 @@ Descendant src/app/components/transaction/transaction.component.html - 179 + 198 src/app/components/transaction/transaction.component.html - 191 + 210 Descendant transaction.descendant @@ -5485,7 +6197,7 @@ Ancestor src/app/components/transaction/transaction.component.html - 203 + 222 Transaction Ancestor transaction.ancestor @@ -5494,7 +6206,7 @@ RBF History src/app/components/transaction/transaction.component.html - 222 + 241 RBF History transaction.rbf-history @@ -5503,11 +6215,11 @@ Flow src/app/components/transaction/transaction.component.html - 231 + 250 src/app/components/transaction/transaction.component.html - 386 + 405 Transaction flow transaction.flow @@ -5516,7 +6228,7 @@ Hide diagram src/app/components/transaction/transaction.component.html - 234 + 253 hide-diagram @@ -5524,7 +6236,7 @@ Show more src/app/components/transaction/transaction.component.html - 255 + 274 src/app/components/transactions-list/transactions-list.component.html @@ -5540,7 +6252,7 @@ Show diagram src/app/components/transaction/transaction.component.html - 277 + 296 show-diagram @@ -5548,7 +6260,7 @@ Adjusted vsize src/app/components/transaction/transaction.component.html - 302 + 321 Transaction Adjusted VSize transaction.adjusted-vsize @@ -5557,7 +6269,7 @@ Locktime src/app/components/transaction/transaction.component.html - 324 + 343 transaction.locktime @@ -5565,7 +6277,7 @@ Sigops src/app/components/transaction/transaction.component.html - 328 + 347 Transaction Sigops transaction.sigops @@ -5574,7 +6286,7 @@ Transaction not found. src/app/components/transaction/transaction.component.html - 495 + 514 transaction.error.transaction-not-found @@ -5582,15 +6294,23 @@ Waiting for it to appear in the mempool... src/app/components/transaction/transaction.component.html - 496 + 515 transaction.error.waiting-for-it-to-appear + + Error loading transaction data. + + src/app/components/transaction/transaction.component.html + 521 + + transaction.error.loading-transaction-data + Accelerated fee rate src/app/components/transaction/transaction.component.html - 528 + 547 Accelerated transaction fee rate transaction.accelerated-fee-rate @@ -5743,21 +6463,57 @@ src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html - 55 + 86 transaction.input - - Output + + 1 block earlier src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html - 43 + 123 + shared.one-block-earlier + + + 1 block later src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html - 54 + 127 - transaction.output + shared.one-block-later + + + in the same block + + src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html + 131 + + shared.in-the-same-block + + + blocks earlier + + src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html + 137 + + shared.n-blocks-earlier + + + spent + + src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html + 148 + + shared.spent + + + blocks later + + src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html + 150 + + shared.n-blocks-later This transaction saved % on fees by using native SegWit @@ -5898,11 +6654,27 @@ fees-box.transaction-fees + + Mempool Goggles + + src/app/dashboard/dashboard.component.html + 21 + + dashboard.mempool-goggles + + + Incoming Transactions + + src/app/dashboard/dashboard.component.html + 47 + + dashboard.incoming-transactions + Recent Replacements src/app/dashboard/dashboard.component.html - 79 + 64 dashboard.recent-rbf-replacements @@ -5910,7 +6682,7 @@ Previous fee src/app/dashboard/dashboard.component.html - 86 + 71 dashboard.previous-transaction-fee @@ -5918,7 +6690,7 @@ New fee src/app/dashboard/dashboard.component.html - 87 + 72 dashboard.new-transaction-fee @@ -5926,15 +6698,51 @@ Recent Transactions src/app/dashboard/dashboard.component.html - 153 + 130 dashboard.recent-transactions + + Liquid Federation Holdings + + src/app/dashboard/dashboard.component.html + 164 + + + src/app/dashboard/dashboard.component.html + 304 + + liquid.federation-holdings + + + Federation Timelock-Expired UTXOs + + src/app/dashboard/dashboard.component.html + 173 + + + src/app/dashboard/dashboard.component.html + 313 + + liquid.federation-expired-utxos + + + L-BTC Supply Against BTC Holdings + + src/app/dashboard/dashboard.component.html + 183 + + + src/app/dashboard/dashboard.component.html + 323 + + dashboard.lbtc-supply-against-btc-holdings + Minimum fee src/app/dashboard/dashboard.component.html - 245 + 274 Minimum mempool fee dashboard.minimum-fee @@ -5943,26 +6751,18 @@ Purging src/app/dashboard/dashboard.component.html - 246 + 275 Purgin below fee dashboard.purging - - L-BTC in circulation + + Audit in progress: Bitcoin block height # / # src/app/dashboard/dashboard.component.html - 272 + 363,365 - dashboard.lbtc-pegs-in-circulation - - - Incoming Transactions - - src/app/dashboard/dashboard.component.html - 281 - - dashboard.incoming-transactions + liquid.audit-in-progress mempool.space merely provides data about the Bitcoin network. It cannot help you with retrieving funds, wallet issues, etc.For any such requests, you need to get in touch with the entity that helped make the transaction (wallet software, exchange company, etc). @@ -5976,7 +6776,7 @@ REST API service src/app/docs/api-docs/api-docs.component.html - 42 + 50 api-docs.title @@ -5984,11 +6784,11 @@ Endpoint src/app/docs/api-docs/api-docs.component.html - 51 + 60 src/app/docs/api-docs/api-docs.component.html - 105 + 115 Api docs endpoint @@ -5996,11 +6796,11 @@ Description src/app/docs/api-docs/api-docs.component.html - 70 + 79 src/app/docs/api-docs/api-docs.component.html - 109 + 119 src/app/lightning/group/group.component.html @@ -6011,7 +6811,7 @@ Default push: action: 'want', data: ['blocks', ...] to express what you want pushed. Available: blocks, mempool-blocks, live-2h-chart, and stats.Push transactions related to address: 'track-address': '3PbJ...bF9B' to receive all new transactions containing that address as input or output. Returns an array of transactions. address-transactions for new mempool transactions, and block-transactions for new block confirmed transactions. src/app/docs/api-docs/api-docs.component.html - 110 + 120 api-docs.websocket.websocket @@ -6055,77 +6855,77 @@ FAQ src/app/docs/docs/docs.component.ts - 45 + 47 Get answers to common questions like: What is a mempool? Why isn't my transaction confirming? How can I run my own instance of The Mempool Open Source Project? And more. src/app/docs/docs/docs.component.ts - 46 + 48 REST API src/app/docs/docs/docs.component.ts - 49 + 52 Documentation for the liquid.network REST API service: get info on addresses, transactions, assets, blocks, and more. src/app/docs/docs/docs.component.ts - 51 + 54 Documentation for the bisq.markets REST API service: get info on recent trades, current offers, transactions, network state, and more. src/app/docs/docs/docs.component.ts - 53 + 56 Documentation for the mempool.space REST API service: get info on addresses, transactions, blocks, fees, mining, the Lightning network, and more. src/app/docs/docs/docs.component.ts - 55 + 58 WebSocket API src/app/docs/docs/docs.component.ts - 59 + 62 Documentation for the liquid.network WebSocket API service: get real-time info on blocks, mempools, transactions, addresses, and more. src/app/docs/docs/docs.component.ts - 61 + 64 Documentation for the mempool.space WebSocket API service: get real-time info on blocks, mempools, transactions, addresses, and more. src/app/docs/docs/docs.component.ts - 63 + 66 Electrum RPC src/app/docs/docs/docs.component.ts - 67 + 70 Documentation for our Electrum RPC interface: get instant, convenient, and reliable access to an Esplora instance. src/app/docs/docs/docs.component.ts - 68 + 71 @@ -6156,7 +6956,7 @@ src/app/lightning/node/node.component.html - 228 + 226 shared.m-sats @@ -6226,9 +7026,13 @@ src/app/lightning/channels-list/channels-list.component.html 123 + + src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts + 313 + src/app/lightning/nodes-map/nodes-map.component.ts - 212 + 213 lightning.x-channels @@ -6346,11 +7150,11 @@ src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts - 157 + 159 src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts - 227 + 229 src/app/lightning/node-statistics/node-statistics.component.html @@ -6374,7 +7178,7 @@ src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html - 61 + 57 src/app/lightning/nodes-per-isp/nodes-per-isp.component.html @@ -6386,11 +7190,11 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts - 203 + 213 src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts - 283 + 293 lightning.capacity @@ -6445,7 +7249,7 @@ src/app/lightning/node/node.component.html - 82 + 80 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -6757,7 +7561,7 @@ src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html - 60 + 56 src/app/lightning/nodes-per-isp/nodes-per-isp-preview.component.html @@ -6809,11 +7613,11 @@ src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts - 149 + 151 src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts - 204 + 206 src/app/lightning/node-statistics/node-statistics.component.html @@ -6861,11 +7665,11 @@ src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts - 195 + 205 src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts - 260 + 270 lightning.channels @@ -6906,7 +7710,7 @@ src/app/lightning/node/node.component.html - 53 + 51 src/app/lightning/nodes-per-country/nodes-per-country.component.html @@ -6958,7 +7762,7 @@ Lightning Network History src/app/lightning/lightning-dashboard/lightning-dashboard.component.html - 49 + 52 lightning.network-history @@ -6966,7 +7770,7 @@ Liquidity Ranking src/app/lightning/lightning-dashboard/lightning-dashboard.component.html - 62 + 66 src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.html @@ -6986,7 +7790,7 @@ Connectivity Ranking src/app/lightning/lightning-dashboard/lightning-dashboard.component.html - 76 + 80 src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.html @@ -7006,7 +7810,7 @@ Get stats on the Lightning network (aggregate capacity, connectivity, etc), Lightning nodes (channels, liquidity, etc) and Lightning channels (status, fees, etc). src/app/lightning/lightning-dashboard/lightning-dashboard.component.ts - 28 + 34 @@ -7021,22 +7825,22 @@ Outgoing Fees src/app/lightning/node-fee-chart/node-fee-chart.component.ts - 177 + 179 src/app/lightning/node-fee-chart/node-fee-chart.component.ts - 215 + 217 Incoming Fees src/app/lightning/node-fee-chart/node-fee-chart.component.ts - 185 + 187 src/app/lightning/node-fee-chart/node-fee-chart.component.ts - 229 + 231 @@ -7067,7 +7871,7 @@ src/app/lightning/node/node.component.html - 308 + 306 lightning.node @@ -7079,7 +7883,7 @@ src/app/lightning/node/node.component.html - 33 + 31 lightning.active-capacity @@ -7091,7 +7895,7 @@ src/app/lightning/node/node.component.html - 40 + 38 lightning.active-channels @@ -7111,14 +7915,14 @@ src/app/lightning/node/node.component.ts - 63 + 64 Average channel size src/app/lightning/node/node.component.html - 46 + 44 lightning.active-channels-avg @@ -7126,7 +7930,7 @@ Avg channel distance src/app/lightning/node/node.component.html - 62 + 60 lightning.avg-distance @@ -7134,7 +7938,7 @@ Color src/app/lightning/node/node.component.html - 88 + 86 lightning.color @@ -7142,11 +7946,11 @@ ISP src/app/lightning/node/node.component.html - 94 + 92 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html - 58 + 54 isp @@ -7154,7 +7958,7 @@ Exclusively on Tor src/app/lightning/node/node.component.html - 102 + 100 tor @@ -7162,7 +7966,7 @@ Decoded src/app/lightning/node/node.component.html - 136 + 134 Decoded lightning.decoded @@ -7171,7 +7975,7 @@ Liquidity ad src/app/lightning/node/node.component.html - 186 + 184 node.liquidity-ad @@ -7179,7 +7983,7 @@ Lease fee rate src/app/lightning/node/node.component.html - 192 + 190 Liquidity ad lease fee rate liquidity-ad.lease-fee-rate @@ -7188,7 +7992,7 @@ Lease base fee src/app/lightning/node/node.component.html - 200 + 198 liquidity-ad.lease-base-fee @@ -7196,7 +8000,7 @@ Funding weight src/app/lightning/node/node.component.html - 206 + 204 liquidity-ad.funding-weight @@ -7204,7 +8008,7 @@ Channel fee rate src/app/lightning/node/node.component.html - 216 + 214 Liquidity ad channel fee rate liquidity-ad.channel-fee-rate @@ -7213,7 +8017,7 @@ Channel base fee src/app/lightning/node/node.component.html - 224 + 222 liquidity-ad.channel-base-fee @@ -7221,7 +8025,7 @@ Compact lease src/app/lightning/node/node.component.html - 236 + 234 liquidity-ad.compact-lease @@ -7229,7 +8033,7 @@ TLV extension records src/app/lightning/node/node.component.html - 247 + 245 node.tlv.records @@ -7237,7 +8041,7 @@ Open channels src/app/lightning/node/node.component.html - 288 + 286 lightning.open-channels @@ -7245,7 +8049,7 @@ Closed channels src/app/lightning/node/node.component.html - 292 + 290 lightning.open-channels @@ -7253,14 +8057,14 @@ Node: src/app/lightning/node/node.component.ts - 62 + 63 (Tor nodes excluded) src/app/lightning/nodes-channels-map/nodes-channels-map.component.html - 21 + 22 src/app/lightning/nodes-map/nodes-map.component.html @@ -7280,28 +8084,28 @@ Lightning Nodes Channels World Map src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts - 69 + 73 See the channels of non-Tor Lightning network nodes visualized on a world map. Hover/tap on points on the map for node names and details. src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts - 70 + 74 No geolocation data available src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts - 228 + 245 Active channels map src/app/lightning/nodes-channels/node-channels.component.html - 2 + 3 lightning.active-channels-map @@ -7309,58 +8113,58 @@ See the locations of non-Tor Lightning network nodes visualized on a world map. Hover/tap on points on the map for node names and details. src/app/lightning/nodes-map/nodes-map.component.ts - 51 + 52 See the number of Lightning network nodes visualized over time by network: clearnet only (IPv4, IPv6), darknet (Tor, I2p, cjdns), and both. src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts - 68 + 74 Indexing in progress src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts - 122 + 133 src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts - 113 + 123 Clearnet and Darknet src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts - 165 + 176 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts - 304 + 315 Clearnet Only (IPv4, IPv6) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts - 186 + 197 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts - 296 + 307 Darknet Only (Tor, I2P, cjdns) src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts - 207 + 218 src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts - 288 + 299 @@ -7371,7 +8175,7 @@ src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html - 59 + 55 lightning.share @@ -7394,11 +8198,11 @@ src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 161 + 162 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 194 + 195 @@ -7436,14 +8240,14 @@ Lightning nodes in src/app/lightning/nodes-per-country/nodes-per-country.component.ts - 35 + 43 Explore all the Lightning nodes hosted in and see an overview of each node's capacity, number of open channels, and more. src/app/lightning/nodes-per-country/nodes-per-country.component.ts - 36 + 44 @@ -7454,7 +8258,7 @@ src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html - 82 + 81 lightning.clearnet-capacity @@ -7474,7 +8278,7 @@ src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html - 88 + 87 lightning.unknown-capacity @@ -7494,7 +8298,7 @@ src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html - 94 + 93 lightning.tor-capacity @@ -7518,7 +8322,7 @@ Indexing in progress src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.html - 103 + 102 src/app/lightning/statistics-chart/lightning-statistics-chart.component.html @@ -7530,11 +8334,11 @@ BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 162 + 163 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 195 + 196 @@ -7573,7 +8377,7 @@ src/app/lightning/nodes-per-isp/nodes-per-isp.component.ts - 39 + 46 @@ -7584,7 +8388,7 @@ src/app/lightning/nodes-per-isp/nodes-per-isp.component.ts - 40 + 47 @@ -7673,7 +8477,7 @@ See the capacity of the Lightning network visualized over time in terms of the number of open channels and total bitcoin capacity. src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts - 67 + 71 @@ -7725,7 +8529,11 @@ sat/WU src/app/shared/components/fee-rate/fee-rate.component.html - 3 + 4 + + + src/app/shared/components/fee-rate/fee-rate.component.html + 8 sat/WU shared.sat-weight-units @@ -7933,6 +8741,15 @@ Trademark Policy shared.trademark-policy + + Third-party Licenses + + src/app/shared/components/global-footer/global-footer.component.html + 80 + + Third-party Licenses + shared.trademark-policy + This is a test network. Coins have no value. From 931551a17f8f0506253093d201e207b17870a0de Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 2 Apr 2024 16:05:52 +0900 Subject: [PATCH 14/17] New extract --- frontend/src/locale/messages.xlf | 1918 ++++++++++-------------------- 1 file changed, 600 insertions(+), 1318 deletions(-) diff --git a/frontend/src/locale/messages.xlf b/frontend/src/locale/messages.xlf index 1035a2477..bccde41a9 100644 --- a/frontend/src/locale/messages.xlf +++ b/frontend/src/locale/messages.xlf @@ -236,1179 +236,6 @@ 13 - - Address - - src/app/bisq/bisq-address/bisq-address.component.html - 2 - - - src/app/components/address/address-preview.component.html - 3 - - - src/app/components/address/address.component.html - 3 - - - src/app/components/liquid-reserves-audit/federation-addresses-list/federation-addresses-list.component.html - 8 - - - src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html - 9 - - shared.address - - - Total received - - src/app/bisq/bisq-address/bisq-address.component.html - 20 - - - src/app/components/address/address-preview.component.html - 22 - - - src/app/components/address/address.component.html - 30 - - address.total-received - - - Total sent - - src/app/bisq/bisq-address/bisq-address.component.html - 24 - - - src/app/bisq/bisq-blocks/bisq-blocks.component.html - 14 - - - src/app/components/address/address-preview.component.html - 26 - - - src/app/components/address/address.component.html - 34 - - address.total-sent - - - Balance - - src/app/bisq/bisq-address/bisq-address.component.html - 28 - - - src/app/components/address/address-preview.component.html - 31 - - - src/app/components/address/address.component.html - 39 - - - src/app/components/liquid-reserves-audit/federation-addresses-list/federation-addresses-list.component.html - 9 - - address.balance - - - transaction - - src/app/bisq/bisq-address/bisq-address.component.html - 48 - - - src/app/bisq/bisq-block/bisq-block.component.html - 51 - - - src/app/components/block/block.component.html - 331 - - - src/app/components/blockchain-blocks/blockchain-blocks.component.html - 54 - - - src/app/components/mempool-blocks/mempool-blocks.component.html - 31 - - shared.transaction-count.singular - - - transactions - - src/app/bisq/bisq-address/bisq-address.component.html - 49 - - - src/app/bisq/bisq-block/bisq-block.component.html - 52 - - - src/app/components/block/block.component.html - 332 - - - src/app/components/blockchain-blocks/blockchain-blocks.component.html - 55 - - - src/app/components/mempool-blocks/mempool-blocks.component.html - 32 - - shared.transaction-count.plural - - - Error loading address data. - - src/app/bisq/bisq-address/bisq-address.component.html - 102 - - - src/app/components/address/address.component.html - 140 - - - src/app/components/address/address.component.html - 157 - - address.error.loading-address-data - - - Address: - - src/app/bisq/bisq-address/bisq-address.component.ts - 43 - - - - See current balance, pending transactions, and history of confirmed transactions for BSQ address . - - src/app/bisq/bisq-address/bisq-address.component.ts - 44 - - - - Block - - src/app/bisq/bisq-block/bisq-block.component.html - 4 - - shared.block-title - - - Hash - - src/app/bisq/bisq-block/bisq-block.component.html - 19 - - - src/app/bisq/bisq-block/bisq-block.component.html - 82 - - - src/app/components/block/block.component.html - 44 - - block.hash - - - Timestamp - - src/app/bisq/bisq-block/bisq-block.component.html - 23 - - - src/app/bisq/bisq-block/bisq-block.component.html - 86 - - - src/app/bisq/bisq-transaction/bisq-transaction.component.html - 32 - - - src/app/components/block/block-preview.component.html - 26 - - - src/app/components/block/block.component.html - 48 - - - src/app/components/blocks-list/blocks-list.component.html - 15 - - - src/app/components/pool/pool.component.html - 182 - - - src/app/components/pool/pool.component.html - 244 - - - src/app/components/search-form/search-results/search-results.component.html - 15 - - - src/app/components/transaction/transaction.component.html - 53 - - block.timestamp - - - Previous hash - - src/app/bisq/bisq-block/bisq-block.component.html - 37 - - - src/app/bisq/bisq-block/bisq-block.component.html - 95 - - Transaction Previous Hash - block.previous_hash - - - Block : - - src/app/bisq/bisq-block/bisq-block.component.ts - 91 - - - - See all BSQ transactions in Bitcoin block (block hash ). - - src/app/bisq/bisq-block/bisq-block.component.ts - 92 - - - - BSQ Blocks - - src/app/bisq/bisq-blocks/bisq-blocks.component.html - 2 - - Bisq blocks header - - - Height - - src/app/bisq/bisq-blocks/bisq-blocks.component.html - 12 - - - src/app/bisq/bisq-transactions/bisq-transactions.component.html - 22 - - - src/app/components/blocks-list/blocks-list.component.html - 12 - - - src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html - 5 - - - src/app/components/pool/pool.component.html - 181 - - - src/app/components/pool/pool.component.html - 243 - - - src/app/dashboard/dashboard.component.html - 104 - - Bisq block height header - - - Confirmed - - src/app/bisq/bisq-blocks/bisq-blocks.component.html - 13 - - Bisq block confirmed time header - - - Transactions - - src/app/bisq/bisq-blocks/bisq-blocks.component.html - 15 - - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 81 - - - src/app/components/address/address-preview.component.html - 35 - - - src/app/components/bisq-master-page/bisq-master-page.component.html - 63 - - - src/app/components/block/block.component.html - 419 - - - src/app/components/block/block.component.html - 451 - - - src/app/components/block/block.component.html - 475 - - - src/app/components/blocks-list/blocks-list.component.html - 24 - - - src/app/components/clock/clock.component.html - 59 - - - src/app/components/mempool-block/mempool-block.component.html - 32 - - Bisq block transactions title - - - Blocks - - src/app/bisq/bisq-blocks/bisq-blocks.component.ts - 38 - - - src/app/components/bisq-master-page/bisq-master-page.component.html - 66 - - - src/app/components/blocks-list/blocks-list.component.html - 4 - - - src/app/components/liquid-master-page/liquid-master-page.component.html - 68 - - - src/app/components/master-page/master-page.component.html - 69 - - - src/app/components/pool-ranking/pool-ranking.component.html - 94 - - - - See a list of recent Bitcoin blocks with BSQ transactions, total BSQ sent per block, and more. - - src/app/bisq/bisq-blocks/bisq-blocks.component.ts - 39 - - - - Bisq Trading Volume - - src/app/bisq/bisq-dashboard/bisq-dashboard.component.html - 3 - - - src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html - 48 - - Bisq markets title - - - Markets - - src/app/bisq/bisq-dashboard/bisq-dashboard.component.html - 20 - - - src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html - 66 - - Bisq All Markets - - - Bitcoin Markets - - src/app/bisq/bisq-dashboard/bisq-dashboard.component.html - 21 - - - src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html - 67 - - Bisq Bitcoin Markets - - - Currency - - src/app/bisq/bisq-dashboard/bisq-dashboard.component.html - 27 - - - src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html - 73 - - - - Price - - src/app/bisq/bisq-dashboard/bisq-dashboard.component.html - 28 - - - src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html - 74 - - - src/app/bisq/bisq-market/bisq-market.component.html - 79 - - - src/app/bisq/bisq-stats/bisq-stats.component.html - 36 - - - src/app/bisq/bisq-stats/bisq-stats.component.html - 78 - - - src/app/bisq/bisq-trades/bisq-trades.component.html - 5 - - - src/app/components/clock/clock.component.html - 41 - - - - Volume (7d) - - src/app/bisq/bisq-dashboard/bisq-dashboard.component.html - 29 - - Trading volume 7D - - - Trades (7d) - - src/app/bisq/bisq-dashboard/bisq-dashboard.component.html - 30 - - - src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html - 75 - - Trades amount 7D - - - Latest Trades - - src/app/bisq/bisq-dashboard/bisq-dashboard.component.html - 52 - - - src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html - 99 - - - src/app/bisq/bisq-market/bisq-market.component.html - 59 - - Latest Trades header - - - Markets - - src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts - 32 - - - - Explore the full Bitcoin ecosystem with The Mempool Open Source Project&reg;. See Bisq market prices, trading activity, and more. - - src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts - 33 - - - - Bisq Price Index - - src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html - 9 - - bisq-dashboard.price-index-title - - - Bisq Market Price - - src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html - 21 - - bisq-dashboard.market-price-title - - - View more » - - src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html - 92 - - - src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html - 101 - - - src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html - 64 - - - src/app/components/mining-dashboard/mining-dashboard.component.html - 34 - - - src/app/components/mining-dashboard/mining-dashboard.component.html - 46 - - - src/app/lightning/lightning-dashboard/lightning-dashboard.component.html - 42 - - - src/app/lightning/lightning-dashboard/lightning-dashboard.component.html - 56 - - dashboard.view-more - - - Buy Offers - - src/app/bisq/bisq-market/bisq-market.component.html - 73 - - Bisq Buy Offers - - - Sell Offers - - src/app/bisq/bisq-market/bisq-market.component.html - 74 - - Bisq Sell Offers - - - Amount () - - src/app/bisq/bisq-market/bisq-market.component.html - 112 - - - src/app/bisq/bisq-trades/bisq-trades.component.html - 46 - - Trade amount (Symbol) - - - Bisq market: - - src/app/bisq/bisq-market/bisq-market.component.ts - 51 - - - - See price history, current buy/sell offers, and latest trades for the market on Bisq. - - src/app/bisq/bisq-market/bisq-market.component.ts - 52 - - - - BSQ statistics - - src/app/bisq/bisq-stats/bisq-stats.component.html - 2 - - - src/app/bisq/bisq-stats/bisq-stats.component.ts - 28 - - BSQ statistics header - - - Existing amount - - src/app/bisq/bisq-stats/bisq-stats.component.html - 12 - - - src/app/bisq/bisq-stats/bisq-stats.component.html - 54 - - BSQ existing amount - - - Minted amount - - src/app/bisq/bisq-stats/bisq-stats.component.html - 16 - - - src/app/bisq/bisq-stats/bisq-stats.component.html - 58 - - BSQ minted amount - - - Burnt amount - - src/app/bisq/bisq-stats/bisq-stats.component.html - 20 - - - src/app/bisq/bisq-stats/bisq-stats.component.html - 62 - - - src/app/bisq/bisq-transaction/bisq-transaction.component.html - 62 - - - src/app/bisq/bisq-transfers/bisq-transfers.component.html - 68 - - BSQ burnt amount - - - Addresses - - src/app/bisq/bisq-stats/bisq-stats.component.html - 24 - - - src/app/bisq/bisq-stats/bisq-stats.component.html - 66 - - - src/app/components/liquid-reserves-audit/federation-wallet/federation-wallet.component.html - 15 - - - src/app/components/pool/pool.component.html - 39 - - - src/app/components/pool/pool.component.html - 63 - - - src/app/components/pool/pool.component.html - 321 - - - src/app/components/pool/pool.component.html - 332 - - BSQ addresses - - - Unspent TXOs - - src/app/bisq/bisq-stats/bisq-stats.component.html - 28 - - - src/app/bisq/bisq-stats/bisq-stats.component.html - 70 - - - src/app/components/address/address-preview.component.html - 39 - - BSQ unspent transaction outputs - - - Spent TXOs - - src/app/bisq/bisq-stats/bisq-stats.component.html - 32 - - BSQ spent transaction outputs - - - Market cap - - src/app/bisq/bisq-stats/bisq-stats.component.html - 40 - - - src/app/bisq/bisq-stats/bisq-stats.component.html - 82 - - BSQ token market cap - - - See high-level stats on the BSQ economy: supply metrics, number of addresses, BSQ price, market cap, and more. - - src/app/bisq/bisq-stats/bisq-stats.component.ts - 29 - - - - Date - - src/app/bisq/bisq-trades/bisq-trades.component.html - 4 - - - src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html - 12 - - - src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html - 13 - - - src/app/components/search-form/search-results/search-results.component.html - 9 - - - - Amount - - src/app/bisq/bisq-trades/bisq-trades.component.html - 9 - - - src/app/bisq/bisq-transactions/bisq-transactions.component.html - 20 - - - src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 38 - - - src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html - 10 - - - src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html - 14 - - - src/app/dashboard/dashboard.component.html - 134 - - - - Inputs - - src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html - 7 - - transaction.inputs - - - Outputs - - src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html - 11 - - transaction.outputs - - - Issued amount - - src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html - 15 - - - src/app/components/asset/asset.component.html - 45 - - Liquid Asset issued amount - asset.issued-amount - - - Type - - src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html - 25 - - - src/app/bisq/bisq-transactions/bisq-transactions.component.html - 19 - - - src/app/components/transaction/transaction.component.html - 187 - - - src/app/components/transactions-list/transactions-list.component.html - 276 - - - - Version - - src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.html - 29 - - - src/app/components/block/block.component.html - 273 - - - src/app/components/transaction/transaction.component.html - 339 - - transaction.version - - - Transaction - - src/app/bisq/bisq-transaction/bisq-transaction.component.html - 6 - - - src/app/bisq/bisq-transaction/bisq-transaction.component.html - 110 - - - src/app/components/block-overview-tooltip/block-overview-tooltip.component.html - 12 - - - src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html - 12 - - - src/app/components/rbf-timeline/rbf-timeline-tooltip.component.html - 11 - - - src/app/components/transaction/transaction-preview.component.html - 3 - - - src/app/components/transaction/transaction.component.html - 20 - - - src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html - 72 - - shared.transaction - - - Included in block - - src/app/bisq/bisq-transaction/bisq-transaction.component.html - 41 - - Transaction included in block - transaction.included-in-block - - - Features - - src/app/bisq/bisq-transaction/bisq-transaction.component.html - 47 - - - src/app/components/transaction/transaction.component.html - 68 - - - src/app/components/transaction/transaction.component.html - 163 - - - src/app/lightning/node/node.component.html - 120 - - Transaction features - transaction.features - - - Fee per vByte - - src/app/bisq/bisq-transaction/bisq-transaction.component.html - 67 - - Transaction fee - transaction.fee-per-vbyte - - - Fee per weight unit - - src/app/bisq/bisq-transaction/bisq-transaction.component.html - 68 - - Transaction fee - transaction.fee-per-wu - - - Details - - src/app/bisq/bisq-transaction/bisq-transaction.component.html - 88 - - - src/app/bisq/bisq-transaction/bisq-transaction.component.html - 154 - - - src/app/components/transaction/transaction.component.html - 305 - - - src/app/components/transaction/transaction.component.html - 465 - - transaction.details - - - Inputs & Outputs - - src/app/bisq/bisq-transaction/bisq-transaction.component.html - 96 - - - src/app/bisq/bisq-transaction/bisq-transaction.component.html - 178 - - - src/app/components/transaction/transaction.component.html - 292 - - - src/app/components/transaction/transaction.component.html - 436 - - Transaction inputs and outputs - transaction.inputs-and-outputs - - - Transaction: - - src/app/bisq/bisq-transaction/bisq-transaction.component.ts - 50 - - - src/app/components/transaction/transaction-preview.component.ts - 89 - - - src/app/components/transaction/transaction.component.ts - 398 - - - - See inputs, outputs, transaction type, burnt amount, and more for transaction with txid . - - src/app/bisq/bisq-transaction/bisq-transaction.component.ts - 51 - - - - BSQ Transactions - - src/app/bisq/bisq-transactions/bisq-transactions.component.html - 2 - - - - TXID - - src/app/bisq/bisq-transactions/bisq-transactions.component.html - 18 - - - src/app/components/acceleration/accelerations-list/accelerations-list.component.html - 10 - - - src/app/components/transaction/transaction.component.html - 188 - - - src/app/dashboard/dashboard.component.html - 70 - - - src/app/dashboard/dashboard.component.html - 133 - - - - Confirmed - - src/app/bisq/bisq-transactions/bisq-transactions.component.html - 21 - - - src/app/components/transaction/transaction.component.html - 63 - - - src/app/shared/components/confirmations/confirmations.component.html - 9 - - Transaction Confirmed state - transaction.confirmed - - - Asset listing fee - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 31 - - - - Blind vote - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 32 - - - - Compensation request - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 33 - - - - Genesis - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 34 - - - src/app/components/block/block-preview.component.html - 10 - - - src/app/components/block/block.component.html - 10 - - - - Irregular - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 35 - - - - Lockup - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 36 - - - - Pay trade fee - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 37 - - - - Proof of burn - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 38 - - - - Proposal - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 39 - - - - Reimbursement request - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 40 - - - - Transfer BSQ - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 41 - - - - Unlock - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 42 - - - - Vote reveal - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 43 - - - - Filter - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 57 - - - - Select all - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 58 - - - - Unselect all - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 59 - - - - See recent BSQ transactions: amount, txid, associated Bitcoin block, transaction type, and more. - - src/app/bisq/bisq-transactions/bisq-transactions.component.ts - 82 - - - - Trades - - src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts - 99 - - - - Volume - - src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts - 100 - - Become a Community Sponsor @@ -1526,17 +353,13 @@ src/app/components/about/about.component.ts 49 - - src/app/components/bisq-master-page/bisq-master-page.component.html - 75 - src/app/components/liquid-master-page/liquid-master-page.component.html - 85 + 84 src/app/components/master-page/master-page.component.html - 78 + 77 @@ -1846,6 +669,26 @@ master-page.blocks + + TXID + + src/app/components/acceleration/accelerations-list/accelerations-list.component.html + 10 + + + src/app/components/transaction/transaction.component.html + 188 + + + src/app/dashboard/dashboard.component.html + 70 + + + src/app/dashboard/dashboard.component.html + 133 + + dashboard.latest-transactions.txid + Fee Rate @@ -1997,6 +840,30 @@ dashboard.mempool-goggles-accelerations + + View more » + + src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html + 64 + + + src/app/components/mining-dashboard/mining-dashboard.component.html + 34 + + + src/app/components/mining-dashboard/mining-dashboard.component.html + 46 + + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 42 + + + src/app/lightning/lightning-dashboard/lightning-dashboard.component.html + 56 + + dashboard.view-more + Recent Accelerations @@ -2013,7 +880,7 @@ src/app/components/master-page/master-page.component.html - 57 + 56 @@ -2094,6 +961,26 @@ 107 + + Address + + src/app/components/address/address-preview.component.html + 3 + + + src/app/components/address/address.component.html + 3 + + + src/app/components/liquid-reserves-audit/federation-addresses-list/federation-addresses-list.component.html + 8 + + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 9 + + shared.address + Unconfidential @@ -2106,6 +993,86 @@ address.unconfidential + + Total received + + src/app/components/address/address-preview.component.html + 22 + + + src/app/components/address/address.component.html + 30 + + address.total-received + + + Total sent + + src/app/components/address/address-preview.component.html + 26 + + + src/app/components/address/address.component.html + 34 + + address.total-sent + + + Balance + + src/app/components/address/address-preview.component.html + 31 + + + src/app/components/address/address.component.html + 39 + + + src/app/components/liquid-reserves-audit/federation-addresses-list/federation-addresses-list.component.html + 9 + + address.balance + + + Transactions + + src/app/components/address/address-preview.component.html + 35 + + + src/app/components/block/block.component.html + 419 + + + src/app/components/block/block.component.html + 451 + + + src/app/components/block/block.component.html + 475 + + + src/app/components/blocks-list/blocks-list.component.html + 24 + + + src/app/components/clock/clock.component.html + 59 + + + src/app/components/mempool-block/mempool-block.component.html + 32 + + address.transactions + + + Unspent TXOs + + src/app/components/address/address-preview.component.html + 39 + + address.unspent_txos + Confidential @@ -2184,6 +1151,18 @@ X of X Address Transactions (Plural) + + Error loading address data. + + src/app/components/address/address.component.html + 140 + + + src/app/components/address/address.component.html + 157 + + address.error.loading-address-data + There many transactions on this address, more than your backend can handle. See more on setting up a stronger backend. Consider viewing this address on the official Mempool website instead: @@ -2270,6 +1249,15 @@ Liquid Asset pegged-out amount asset.pegged-out + + Issued amount + + src/app/components/asset/asset.component.html + 45 + + Liquid Asset issued amount + asset.issued-amount + Burned amount @@ -2331,6 +1319,13 @@ 75 + + Browse an overview of the Liquid asset (): see issued amount, burned amount, circulating amount, related transactions, and more. + + src/app/components/asset/asset.component.ts + 108 + + Group of assets @@ -2366,7 +1361,7 @@ src/app/components/liquid-master-page/liquid-master-page.component.html - 79 + 78 Assets page header @@ -2479,90 +1474,6 @@ Asset data load error - - Offline - - src/app/components/bisq-master-page/bisq-master-page.component.html - 36 - - - src/app/components/liquid-master-page/liquid-master-page.component.html - 41 - - - src/app/components/master-page/master-page.component.html - 28 - - master-page.offline - - - Reconnecting... - - src/app/components/bisq-master-page/bisq-master-page.component.html - 37 - - - src/app/components/liquid-master-page/liquid-master-page.component.html - 42 - - - src/app/components/master-page/master-page.component.html - 29 - - master-page.reconnecting - - - Layer 2 Networks - - src/app/components/bisq-master-page/bisq-master-page.component.html - 50 - - - src/app/components/liquid-master-page/liquid-master-page.component.html - 55 - - - src/app/components/master-page/master-page.component.html - 42 - - master-page.layer2-networks-header - - - Dashboard - - src/app/components/bisq-master-page/bisq-master-page.component.html - 60 - - - src/app/components/liquid-master-page/liquid-master-page.component.html - 65 - - - src/app/components/master-page/master-page.component.html - 53 - - master-page.dashboard - - - Stats - - src/app/components/bisq-master-page/bisq-master-page.component.html - 69 - - master-page.stats - - - Docs - - src/app/components/bisq-master-page/bisq-master-page.component.html - 72 - - - src/app/components/liquid-master-page/liquid-master-page.component.html - 82 - - master-page.docs - Block Fee Rates @@ -2653,7 +1564,7 @@ src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts - 201 + 202 src/app/components/indexing-progress/indexing-progress.component.html @@ -2680,7 +1591,7 @@ src/app/components/master-page/master-page.component.html - 58 + 57 beta @@ -2756,6 +1667,34 @@ webgl-disabled + + Transaction + + src/app/components/block-overview-tooltip/block-overview-tooltip.component.html + 12 + + + src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html + 12 + + + src/app/components/rbf-timeline/rbf-timeline-tooltip.component.html + 11 + + + src/app/components/transaction/transaction-preview.component.html + 3 + + + src/app/components/transaction/transaction.component.html + 20 + + + src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html + 72 + + shared.transaction + First seen @@ -2814,6 +1753,26 @@ Transaction confirmed after transaction.confirmed-after + + Amount + + src/app/components/block-overview-tooltip/block-overview-tooltip.component.html + 38 + + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 10 + + + src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html + 14 + + + src/app/dashboard/dashboard.component.html + 134 + + dashboard.latest-transactions.amount + Fee @@ -3216,6 +2175,49 @@ 283 + + Genesis + + src/app/components/block/block-preview.component.html + 10 + + + src/app/components/block/block.component.html + 10 + + + + Timestamp + + src/app/components/block/block-preview.component.html + 26 + + + src/app/components/block/block.component.html + 48 + + + src/app/components/blocks-list/blocks-list.component.html + 15 + + + src/app/components/pool/pool.component.html + 182 + + + src/app/components/pool/pool.component.html + 244 + + + src/app/components/search-form/search-results/search-results.component.html + 15 + + + src/app/components/transaction/transaction.component.html + 53 + + block.timestamp + Median fee @@ -3323,6 +2325,14 @@ Stale block state block.stale + + Hash + + src/app/components/block/block.component.html + 44 + + block.hash + Health @@ -3476,6 +2486,18 @@ block.actual-block + + Version + + src/app/components/block/block.component.html + 273 + + + src/app/components/transaction/transaction.component.html + 339 + + transaction.version + Taproot @@ -3607,6 +2629,42 @@ Transaction Details transaction.details + + transaction + + src/app/components/block/block.component.html + 331 + + + src/app/components/blockchain-blocks/blockchain-blocks.component.html + 54 + + + src/app/components/mempool-blocks/mempool-blocks.component.html + 31 + + shared.transaction-count.singular + + + transactions + + src/app/components/block/block.component.html + 332 + + + src/app/components/blockchain-blocks/blockchain-blocks.component.html + 55 + + + src/app/components/mempool-blocks/mempool-blocks.component.html + 32 + + shared.transaction-count.plural + Error loading data. @@ -3647,6 +2705,50 @@ Acceleration Fees + + Blocks + + src/app/components/blocks-list/blocks-list.component.html + 4 + + + src/app/components/liquid-master-page/liquid-master-page.component.html + 67 + + + src/app/components/master-page/master-page.component.html + 68 + + + src/app/components/pool-ranking/pool-ranking.component.html + 94 + + master-page.blocks + + + Height + + src/app/components/blocks-list/blocks-list.component.html + 12 + + + src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html + 5 + + + src/app/components/pool/pool.component.html + 181 + + + src/app/components/pool/pool.component.html + 243 + + + src/app/dashboard/dashboard.component.html + 104 + + latest-blocks.height + Pool @@ -3739,25 +2841,25 @@ dashboard.txs - + Blocks src/app/components/blocks-list/blocks-list.component.ts - 101 + 68 See the most recent Liquid blocks along with basic stats such as block height, block size, and more. src/app/components/blocks-list/blocks-list.component.ts - 105 + 71 See the most recent Bitcoin blocks along with basic stats such as block height, block reward, block size, and more. src/app/components/blocks-list/blocks-list.component.ts - 107 + 73 @@ -3768,7 +2870,7 @@ src/app/shared/components/global-footer/global-footer.component.html - 72 + 71 shared.calculator @@ -3779,6 +2881,13 @@ 19 + + Price + + src/app/components/clock/clock.component.html + 41 + + High Priority @@ -4411,6 +3520,13 @@ 74 + + See Bitcoin mining pool dominance visualized over time: see how top mining pools' share of total hashrate has fluctuated over time. + + src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts + 75 + + Indexing network hashrate @@ -4425,15 +3541,63 @@ 3 + + Offline + + src/app/components/liquid-master-page/liquid-master-page.component.html + 41 + + + src/app/components/master-page/master-page.component.html + 28 + + master-page.offline + + + Reconnecting... + + src/app/components/liquid-master-page/liquid-master-page.component.html + 42 + + + src/app/components/master-page/master-page.component.html + 29 + + master-page.reconnecting + + + Layer 2 Networks + + src/app/components/liquid-master-page/liquid-master-page.component.html + 55 + + + src/app/components/master-page/master-page.component.html + 42 + + master-page.layer2-networks-header + + + Dashboard + + src/app/components/liquid-master-page/liquid-master-page.component.html + 64 + + + src/app/components/master-page/master-page.component.html + 52 + + master-page.dashboard + Graphs src/app/components/liquid-master-page/liquid-master-page.component.html - 71 + 70 src/app/components/master-page/master-page.component.html - 72 + 71 src/app/components/statistics/statistics.component.ts @@ -4441,6 +3605,14 @@ master-page.graphs + + Docs + + src/app/components/liquid-master-page/liquid-master-page.component.html + 81 + + master-page.docs + Non-Dust Expired @@ -4541,6 +3713,22 @@ liquid.related-peg-in + + Date + + src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html + 12 + + + src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html + 13 + + + src/app/components/search-form/search-results/search-results.component.html + 9 + + shared.date + Expires in @@ -4605,6 +3793,30 @@ liquid.timelock-expired-utxos + + Addresses + + src/app/components/liquid-reserves-audit/federation-wallet/federation-wallet.component.html + 15 + + + src/app/components/pool/pool.component.html + 39 + + + src/app/components/pool/pool.component.html + 63 + + + src/app/components/pool/pool.component.html + 321 + + + src/app/components/pool/pool.component.html + 332 + + mining.addresses + Recent Peg-In / Out's @@ -4765,11 +3977,11 @@ Mining Dashboard src/app/components/master-page/master-page.component.html - 62 + 61 src/app/components/mining-dashboard/mining-dashboard.component.ts - 24 + 28 src/app/shared/components/global-footer/global-footer.component.html @@ -4781,7 +3993,7 @@ Lightning Explorer src/app/components/master-page/master-page.component.html - 65 + 64 src/app/lightning/lightning-dashboard/lightning-dashboard.component.ts @@ -4797,7 +4009,7 @@ Documentation src/app/components/master-page/master-page.component.html - 75 + 74 src/app/docs/docs/docs.component.html @@ -4903,7 +4115,7 @@ Get real-time Bitcoin mining stats like hashrate, difficulty adjustment, block rewards, pool dominance, and more. src/app/components/mining-dashboard/mining-dashboard.component.ts - 25 + 29 @@ -5115,11 +4327,11 @@ src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 177 + 178 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 194 + 195 @@ -5674,7 +4886,7 @@ src/app/shared/components/global-footer/global-footer.component.html - 70 + 69 footer.clock-mempool @@ -6002,6 +5214,17 @@ transactions-list.coinbase + + Transaction: + + src/app/components/transaction/transaction-preview.component.ts + 89 + + + src/app/components/transaction/transaction.component.ts + 398 + + Get real-time status, addresses, fees, script info, and more for transaction with txid . @@ -6022,6 +5245,36 @@ RBF replacement transaction.rbf.replacement + + Confirmed + + src/app/components/transaction/transaction.component.html + 63 + + + src/app/shared/components/confirmations/confirmations.component.html + 9 + + Transaction Confirmed state + transaction.confirmed + + + Features + + src/app/components/transaction/transaction.component.html + 68 + + + src/app/components/transaction/transaction.component.html + 163 + + + src/app/lightning/node/node.component.html + 120 + + Transaction features + transaction.features + Audit @@ -6180,6 +5433,18 @@ Accelerate button label transaction.accelerate + + Type + + src/app/components/transaction/transaction.component.html + 187 + + + src/app/components/transactions-list/transactions-list.component.html + 276 + + transactions-list.vout.scriptpubkey-type + Descendant @@ -6248,6 +5513,19 @@ show-more + + Inputs & Outputs + + src/app/components/transaction/transaction.component.html + 292 + + + src/app/components/transaction/transaction.component.html + 436 + + Transaction inputs and outputs + transaction.inputs-and-outputs + Show diagram @@ -6256,6 +5534,18 @@ show-diagram + + Details + + src/app/components/transaction/transaction.component.html + 305 + + + src/app/components/transaction/transaction.component.html + 465 + + transaction.details + Adjusted vsize @@ -6855,77 +6145,70 @@ FAQ src/app/docs/docs/docs.component.ts - 47 + 46 Get answers to common questions like: What is a mempool? Why isn't my transaction confirming? How can I run my own instance of The Mempool Open Source Project? And more. src/app/docs/docs/docs.component.ts - 48 + 47 REST API src/app/docs/docs/docs.component.ts - 52 + 51 Documentation for the liquid.network REST API service: get info on addresses, transactions, assets, blocks, and more. src/app/docs/docs/docs.component.ts - 54 - - - - Documentation for the bisq.markets REST API service: get info on recent trades, current offers, transactions, network state, and more. - - src/app/docs/docs/docs.component.ts - 56 + 53 Documentation for the mempool.space REST API service: get info on addresses, transactions, blocks, fees, mining, the Lightning network, and more. src/app/docs/docs/docs.component.ts - 58 + 55 WebSocket API src/app/docs/docs/docs.component.ts - 62 + 59 Documentation for the liquid.network WebSocket API service: get real-time info on blocks, mempools, transactions, addresses, and more. src/app/docs/docs/docs.component.ts - 64 + 61 Documentation for the mempool.space WebSocket API service: get real-time info on blocks, mempools, transactions, addresses, and more. src/app/docs/docs/docs.component.ts - 66 + 63 Electrum RPC src/app/docs/docs/docs.component.ts - 70 + 67 Documentation for our Electrum RPC interface: get instant, convenient, and reliable access to an Esplora instance. src/app/docs/docs/docs.component.ts - 71 + 68 @@ -8198,11 +7481,11 @@ src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 162 + 163 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 195 + 196 @@ -8330,15 +7613,22 @@ lightning.indexing-in-progress + + Browse the top 100 ISPs hosting Lightning nodes along with stats like total number of nodes per ISP, aggregate BTC capacity per ISP, and more + + src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts + 54 + + BTC src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 163 + 164 src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts - 196 + 197 @@ -8682,19 +7972,11 @@ footer.liquid-explorer - - Bisq Explorer - - src/app/shared/components/global-footer/global-footer.component.html - 65 - - footer.bisq-explorer - Tools src/app/shared/components/global-footer/global-footer.component.html - 69 + 68 footer.tools @@ -8702,7 +7984,7 @@ Clock (Mined) src/app/shared/components/global-footer/global-footer.component.html - 71 + 70 footer.clock-mined @@ -8710,7 +7992,7 @@ Legal src/app/shared/components/global-footer/global-footer.component.html - 76 + 75 footer.legal @@ -8718,7 +8000,7 @@ Terms of Service src/app/shared/components/global-footer/global-footer.component.html - 77 + 76 Terms of Service shared.terms-of-service @@ -8727,7 +8009,7 @@ Privacy Policy src/app/shared/components/global-footer/global-footer.component.html - 78 + 77 Privacy Policy shared.privacy-policy @@ -8736,7 +8018,7 @@ Trademark Policy src/app/shared/components/global-footer/global-footer.component.html - 79 + 78 Trademark Policy shared.trademark-policy @@ -8745,7 +8027,7 @@ Third-party Licenses src/app/shared/components/global-footer/global-footer.component.html - 80 + 79 Third-party Licenses shared.trademark-policy From 468f17c76c3fc99f99cf1570ef0a033d37eecff1 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn Date: Tue, 2 Apr 2024 16:18:52 +0900 Subject: [PATCH 15/17] Add a few more Liquid testnet tests --- .../e2e/liquidtestnet/liquidtestnet.spec.ts | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts index 1f959dd3a..208b3c938 100644 --- a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts +++ b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts @@ -28,6 +28,17 @@ describe('Liquid Testnet', () => { cy.waitForSkeletonGone(); }); + it('loads the dashboard with no scrollbars on mobile', () => { + cy.viewport('iphone-xr'); + cy.visit(`${basePath}`); + cy.waitForSkeletonGone(); + cy.window().then(window => { + const htmlWidth = Cypress.$('html')[0].scrollWidth; + const scrollBarWidth = window.innerWidth - htmlWidth; + expect(scrollBarWidth).to.be.eq(0); //check for no horizontal scrollbar + }); + }); + it('loads the blocks page', () => { cy.visit(`${basePath}`) cy.get('#btn-blocks'); @@ -57,17 +68,14 @@ describe('Liquid Testnet', () => { cy.get('.tv-only').should('not.exist'); }); - it.skip('renders unconfidential addresses correctly on mobile', () => { - cy.viewport('iphone-6'); - cy.visit(`${basePath}/address/__TODO__`); + it('renders unconfidential transactions correctly on mobile', () => { + cy.viewport('iphone-xr'); + cy.visit(`${basePath}/tx/b119f338878416781dc285b94c0de52826341dea43566e4de4740d3ebfd1f6dc#blinded=99707,144c654344aa716d6f3abcc1ca90e5641e4e2a7f633bc09fe3baf64585819a49,1377e4ec8eb0c89296e14ffca57e377f4b51ad8f1c881e43364434d8430dbfda,cdd6caae4c3452586cfcb107478dd2b7acaa5f82714a6a966578255e857eee60`); cy.waitForSkeletonGone(); - //TODO: Add proper IDs for these selectors - const firstRowSelector = '.container-xl > :nth-child(3) > div > :nth-child(1) > .table > tbody'; - const thirdRowSelector = '.container-xl > :nth-child(3) > div > :nth-child(3)'; - cy.get(firstRowSelector).invoke('css', 'width').then(firstRowWidth => { - cy.get(thirdRowSelector).invoke('css', 'width').then(thirdRowWidth => { - expect(parseInt(firstRowWidth)).to.be.lessThan(parseInt(thirdRowWidth)); - }); + cy.window().then(window => { + const htmlWidth = Cypress.$('html')[0].scrollWidth; + const scrollBarWidth = window.innerWidth - htmlWidth; + expect(scrollBarWidth).to.be.eq(0); //check for no horizontal scrollbar }); }); From 3e3bed9aa4c093308e103edde5eaa02f4a503918 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn Date: Tue, 2 Apr 2024 16:54:02 +0900 Subject: [PATCH 16/17] Disable viewport tests for now --- frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts index 208b3c938..a96b0700c 100644 --- a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts +++ b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts @@ -28,7 +28,7 @@ describe('Liquid Testnet', () => { cy.waitForSkeletonGone(); }); - it('loads the dashboard with no scrollbars on mobile', () => { + it.skip('loads the dashboard with no scrollbars on mobile', () => { cy.viewport('iphone-xr'); cy.visit(`${basePath}`); cy.waitForSkeletonGone(); @@ -68,7 +68,7 @@ describe('Liquid Testnet', () => { cy.get('.tv-only').should('not.exist'); }); - it('renders unconfidential transactions correctly on mobile', () => { + it.skip('renders unconfidential transactions correctly on mobile', () => { cy.viewport('iphone-xr'); cy.visit(`${basePath}/tx/b119f338878416781dc285b94c0de52826341dea43566e4de4740d3ebfd1f6dc#blinded=99707,144c654344aa716d6f3abcc1ca90e5641e4e2a7f633bc09fe3baf64585819a49,1377e4ec8eb0c89296e14ffca57e377f4b51ad8f1c881e43364434d8430dbfda,cdd6caae4c3452586cfcb107478dd2b7acaa5f82714a6a966578255e857eee60`); cy.waitForSkeletonGone(); From 72b8ae2a553c4cb4649a90f823bd4557477cae48 Mon Sep 17 00:00:00 2001 From: softsimon Date: Tue, 2 Apr 2024 17:07:18 +0900 Subject: [PATCH 17/17] Revert id change --- .../src/app/components/master-page/master-page.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index 93a5fff44..b245a0d33 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -57,7 +57,7 @@ beta -
Hash ‎{{ block.id | shortenString : 13 }}
Fee span - -
Median fee~ + ~ - @@ -259,7 +259,7 @@ - +

diff --git a/frontend/src/app/components/block/block.component.ts b/frontend/src/app/components/block/block.component.ts index 2602c5ecd..9c812c6f0 100644 --- a/frontend/src/app/components/block/block.component.ts +++ b/frontend/src/app/components/block/block.component.ts @@ -460,9 +460,9 @@ export class BlockComponent implements OnInit, OnDestroy { inBlock[tx.txid] = true; } - blockAudit.feeDelta = blockAudit.expectedFees > 0 ? (blockAudit.expectedFees - (this.block.extras.totalFees + this.oobFees)) / blockAudit.expectedFees : 0; - blockAudit.weightDelta = blockAudit.expectedWeight > 0 ? (blockAudit.expectedWeight - this.block.weight) / blockAudit.expectedWeight : 0; - blockAudit.txDelta = blockAudit.template.length > 0 ? (blockAudit.template.length - this.block.tx_count) / blockAudit.template.length : 0; + blockAudit.feeDelta = blockAudit.expectedFees > 0 ? (blockAudit.expectedFees - (this.block?.extras.totalFees + this.oobFees)) / blockAudit.expectedFees : 0; + blockAudit.weightDelta = blockAudit.expectedWeight > 0 ? (blockAudit.expectedWeight - this.block?.weight) / blockAudit.expectedWeight : 0; + blockAudit.txDelta = blockAudit.template.length > 0 ? (blockAudit.template.length - this.block?.tx_count) / blockAudit.template.length : 0; this.blockAudit = blockAudit; this.setAuditAvailable(true); } else { diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.ts b/frontend/src/app/components/transactions-list/transactions-list.component.ts index 8f91489c1..b66889f0b 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.ts +++ b/frontend/src/app/components/transactions-list/transactions-list.component.ts @@ -154,7 +154,7 @@ export class TransactionsListComponent implements OnInit, OnChanges { }); } else { this.priceService.getBlockPrice$(this.blockTime, true, this.currency).pipe( - tap((price) => this.transactions.forEach((tx) => tx['price'] = price)), + tap((price) => this.transactions?.forEach((tx) => tx['price'] = price)), ).subscribe(); } } @@ -239,7 +239,7 @@ export class TransactionsListComponent implements OnInit, OnChanges { if (this.blockTime && this.transactions?.length && this.currency) { this.priceService.getBlockPrice$(this.blockTime, true, this.currency).pipe( - tap((price) => this.transactions.forEach((tx) => tx['price'] = price)), + tap((price) => this.transactions?.forEach((tx) => tx['price'] = price)), ).subscribe(); } const txIds = this.transactions.filter((tx) => !tx._outspends).map((tx) => tx.txid); From cfb1e1d908c162836fac3b702784d5cb60786a94 Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 1 Apr 2024 19:00:37 +0900 Subject: [PATCH 05/17] ops: Remove nginx config for bisq --- production/nginx/nginx.conf | 29 --------- production/nginx/server-bisq.conf | 105 ------------------------------ 2 files changed, 134 deletions(-) delete mode 100644 production/nginx/server-bisq.conf diff --git a/production/nginx/nginx.conf b/production/nginx/nginx.conf index 3646dd316..c48d4992a 100644 --- a/production/nginx/nginx.conf +++ b/production/nginx/nginx.conf @@ -71,35 +71,6 @@ http { # site configuration include mempool/production/nginx/server-mempool.conf; } - # BISQ.NINJA - server { - # clearnet v4/v6 - #listen 443 ssl http2; - #listen [::]:443 ssl http2; - server_name _; - - # tor v3 - listen 127.0.0.1:82; - set $onion "__NGINX_BISQ_ONION__"; - - # for services from mempool.space like contributors on about page - set $mempoolSpaceServices "https://mempool.space"; - set $mempoolSpaceUnfurler "http://127.0.0.1:8001"; - - # for mempool daemons, see upstream-mempool.conf - set $mempoolBisq "http://mempool-bitcoin-bisq"; - - # for blockstream/esplora daemon, see upstream-esplora.conf - set $esploraMainnet "http://esplora-bitcoin-mainnet"; - - # filesystem paths - root /mempool/public_html/bisq/; - access_log /var/log/nginx/bisq-access.log; - error_log /var/log/nginx/bisq-error.log; - - # site configuration - include mempool/production/nginx/server-bisq.conf; - } # LIQUID.PLACE server { # clearnet v4/v6 diff --git a/production/nginx/server-bisq.conf b/production/nginx/server-bisq.conf deleted file mode 100644 index 76b0d304c..000000000 --- a/production/nginx/server-bisq.conf +++ /dev/null @@ -1,105 +0,0 @@ -include mempool/production/nginx/server-common.conf; -include mempool/production/nginx/location-api-v1-services.conf; - -proxy_cache markets; -proxy_cache_valid 200 30s; - -# route esplora APIs to esplora -location /api/tx/ { - rewrite ^/api/(.*) /$1 break; - try_files /dev/null @esplora-api-cache-disabled; -} -location /api/address-prefix/ { - rewrite ^/api/(.*) /$1 break; - try_files /dev/null @esplora-api-cache-disabled; -} - -# rewrite APIs to match what backend expects -location /api/currencies { - rewrite ^/api/(.*) /api/v1/bisq/markets/$1 break; - try_files /dev/null @mempool-bisq; -} -location /api/depth { - rewrite ^/api/(.*) /api/v1/bisq/markets/$1 break; - try_files /dev/null @mempool-bisq; -} -location /api/hloc { - rewrite ^/api/(.*) /api/v1/bisq/markets/$1 break; - try_files /dev/null @mempool-bisq; -} -location /api/offers { - rewrite ^/api/(.*) /api/v1/bisq/markets/$1 break; - try_files /dev/null @mempool-bisq; -} -location /api/ticker { - rewrite ^/api/(.*) /api/v1/bisq/markets/$1 break; - try_files /dev/null @mempool-bisq; -} -location /api/trades { - rewrite ^/api/(.*) /api/v1/bisq/markets/$1 break; - try_files /dev/null @mempool-bisq; -} -location /api/volumes { - rewrite ^/api/(.*) /api/v1/bisq/markets/$1 break; - try_files /dev/null @mempool-bisq; -} -location /api/markets { - rewrite ^/api/(.*) /api/v1/bisq/markets/$1 break; - try_files /dev/null @mempool-bisq; -} -location /api/v1 { - rewrite ^/api/v1/(.*) /api/v1/bisq/$1 break; - try_files /dev/null @mempool-bisq; -} -location /api { - rewrite ^/api/(.*) /api/v1/bisq/$1 break; - try_files /dev/null @mempool-bisq; -} -location /api/v1/ws { - rewrite ^/api/(.*) /api/v1/bisq/$1 break; - try_files /dev/null @mempool-bisq-websocket; -} -location /bisq/api/v1/ws { - rewrite ^/bisq/api/v1/(.*) /api/v1/bisq/$1 break; - try_files /dev/null @mempool-bisq-websocket; -} -location /bisq/api/v1 { - rewrite ^/bisq/api/v1/(.*) /api/v1/bisq/$1 break; - try_files /dev/null @mempool-bisq; -} -location /bisq/api { - rewrite ^/bisq/api/(.*) /api/v1/bisq/$1 break; - try_files /dev/null @mempool-bisq; -} - -location @mempool-bisq-websocket { - proxy_pass $mempoolBisq; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; -} - -location @mempool-bisq { - proxy_pass $mempoolBisq; - - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_redirect off; -} - -location @esplora-api-cache-disabled { - proxy_pass $esploraMainnet; - - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - - proxy_redirect off; - proxy_buffering off; - - expires -1; -} From 0445c150a27ccf3bcfb3431f57fafc5422c46887 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn Date: Mon, 1 Apr 2024 19:01:08 +0900 Subject: [PATCH 06/17] Run sync-assets-dev when building --- frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/package.json b/frontend/package.json index d7f2a9e02..38ad4ca82 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -34,7 +34,7 @@ "start:local-prod": "npm run generate-config && npm run sync-assets-dev && npm run ng -- serve -c local-prod", "start:local-staging": "npm run generate-config && npm run sync-assets-dev && npm run ng -- serve -c local-staging", "start:mixed": "npm run generate-config && npm run sync-assets-dev && npm run ng -- serve -c mixed", - "build": "npm run generate-config && npm run ng -- build --configuration production --localize && npm run sync-assets && npm run build-mempool.js", + "build": "npm run generate-config && npm run ng -- build --configuration production --localize && npm run sync-assets-dev && npm run sync-assets && npm run build-mempool.js", "sync-assets": "rsync -av ./src/resources ./dist/mempool/browser && node sync-assets.js 'dist/mempool/browser/resources/'", "sync-assets-dev": "node sync-assets.js 'src/resources/'", "generate-config": "node generate-config.js", From 4a6641f5440c3f48aeb9fe4ec5b65b731fb15786 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Tue, 2 Apr 2024 02:02:17 +0000 Subject: [PATCH 07/17] revert reverting better audits PR --- backend/src/api/audit.ts | 29 ++++++++++++++----- backend/src/api/database-migration.ts | 7 ++++- backend/src/api/websocket-handler.ts | 3 +- backend/src/mempool.interfaces.ts | 1 + backend/src/replication/AuditReplication.ts | 1 + .../repositories/BlocksAuditsRepository.ts | 8 +++-- .../block-overview-graph.component.ts | 4 +-- .../block-overview-graph/block-scene.ts | 2 +- .../block-overview-graph/tx-view.ts | 2 +- .../components/block-overview-graph/utils.ts | 4 ++- .../block-overview-tooltip.component.html | 1 + .../app/components/block/block.component.ts | 6 ++++ .../fee-distribution-graph.component.ts | 2 +- .../mempool-block-overview.component.ts | 3 +- .../mempool-block/mempool-block.component.ts | 3 +- .../transaction/transaction.component.html | 5 ++-- .../transaction/transaction.component.ts | 5 +++- .../src/app/dashboard/dashboard.component.ts | 4 +-- .../src/app/interfaces/node-api.interface.ts | 3 +- .../src/app/interfaces/websocket.interface.ts | 15 +--------- frontend/src/app/services/state.service.ts | 4 +-- frontend/src/app/shared/common.utils.ts | 3 +- 22 files changed, 71 insertions(+), 44 deletions(-) diff --git a/backend/src/api/audit.ts b/backend/src/api/audit.ts index 0ddfc2cc2..fb0d05baa 100644 --- a/backend/src/api/audit.ts +++ b/backend/src/api/audit.ts @@ -7,13 +7,14 @@ const PROPAGATION_MARGIN = 180; // in seconds, time since a transaction is first class Audit { auditBlock(transactions: MempoolTransactionExtended[], projectedBlocks: MempoolBlockWithTransactions[], mempool: { [txId: string]: MempoolTransactionExtended }, useAccelerations: boolean = false) - : { censored: string[], added: string[], fresh: string[], sigop: string[], fullrbf: string[], accelerated: string[], score: number, similarity: number } { + : { censored: string[], added: string[], prioritized: string[], fresh: string[], sigop: string[], fullrbf: string[], accelerated: string[], score: number, similarity: number } { if (!projectedBlocks?.[0]?.transactionIds || !mempool) { - return { censored: [], added: [], fresh: [], sigop: [], fullrbf: [], accelerated: [], score: 1, similarity: 1 }; + return { censored: [], added: [], prioritized: [], fresh: [], sigop: [], fullrbf: [], accelerated: [], score: 1, similarity: 1 }; } const matches: string[] = []; // present in both mined block and template const added: string[] = []; // present in mined block, not in template + const prioritized: string[] = [] // present in the mined block, not in the template, but further down in the mempool const fresh: string[] = []; // missing, but firstSeen or lastBoosted within PROPAGATION_MARGIN const rbf: string[] = []; // either missing or present, and either part of a full-rbf replacement, or a conflict with the mined block const accelerated: string[] = []; // prioritized by the mempool accelerator @@ -68,20 +69,27 @@ class Audit { // we can expect an honest miner to include 'displaced' transactions in place of recent arrivals and censored txs // these displaced transactions should occupy the first N weight units of the next projected block - let displacedWeightRemaining = displacedWeight; + let displacedWeightRemaining = displacedWeight + 4000; let index = 0; let lastFeeRate = Infinity; let failures = 0; - while (projectedBlocks[1] && index < projectedBlocks[1].transactionIds.length && failures < 500) { - const txid = projectedBlocks[1].transactionIds[index]; + let blockIndex = 1; + while (projectedBlocks[blockIndex] && failures < 500) { + if (index >= projectedBlocks[blockIndex].transactionIds.length) { + index = 0; + blockIndex++; + } + const txid = projectedBlocks[blockIndex].transactionIds[index]; const tx = mempool[txid]; if (tx) { const fits = (tx.weight - displacedWeightRemaining) < 4000; - const feeMatches = tx.effectiveFeePerVsize >= lastFeeRate; + // 0.005 margin of error for any remaining vsize rounding issues + const feeMatches = tx.effectiveFeePerVsize >= (lastFeeRate - 0.005); if (fits || feeMatches) { isDisplaced[txid] = true; if (fits) { - lastFeeRate = Math.min(lastFeeRate, tx.effectiveFeePerVsize); + // (tx.effectiveFeePerVsize * tx.vsize) / Math.ceil(tx.vsize) attempts to correct for vsize rounding in the simple non-CPFP case + lastFeeRate = Math.min(lastFeeRate, (tx.effectiveFeePerVsize * tx.vsize) / Math.ceil(tx.vsize)); } if (tx.firstSeen == null || (now - (tx?.firstSeen || 0)) > PROPAGATION_MARGIN) { displacedWeightRemaining -= tx.weight; @@ -106,7 +114,11 @@ class Audit { if (rbfCache.has(tx.txid)) { rbf.push(tx.txid); } else if (!isDisplaced[tx.txid]) { - added.push(tx.txid); + if (mempool[tx.txid]) { + prioritized.push(tx.txid); + } else { + added.push(tx.txid); + } } overflowWeight += tx.weight; } @@ -155,6 +167,7 @@ class Audit { return { censored: Object.keys(isCensored), added, + prioritized, fresh, sigop: [], fullrbf: rbf, diff --git a/backend/src/api/database-migration.ts b/backend/src/api/database-migration.ts index cf9acbc53..ae68582af 100644 --- a/backend/src/api/database-migration.ts +++ b/backend/src/api/database-migration.ts @@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository'; import { RowDataPacket } from 'mysql2'; class DatabaseMigration { - private static currentVersion = 75; + private static currentVersion = 76; private queryTimeout = 3600_000; private statisticsAddedIndexed = false; private uniqueLogs: string[] = []; @@ -654,6 +654,11 @@ class DatabaseMigration { await this.$executeQuery('ALTER TABLE `prices` ADD `ZAR` float DEFAULT "-1"'); await this.updateToSchemaVersion(75); } + + if (databaseSchemaVersion < 76 && isBitcoin === true) { + await this.$executeQuery('ALTER TABLE `blocks_audits` ADD prioritized_txs JSON DEFAULT "[]"'); + await this.updateToSchemaVersion(76); + } } /** diff --git a/backend/src/api/websocket-handler.ts b/backend/src/api/websocket-handler.ts index 7503ba1b9..67a2435a4 100644 --- a/backend/src/api/websocket-handler.ts +++ b/backend/src/api/websocket-handler.ts @@ -869,7 +869,7 @@ class WebsocketHandler { } if (Common.indexingEnabled()) { - const { censored, added, fresh, sigop, fullrbf, accelerated, score, similarity } = Audit.auditBlock(transactions, projectedBlocks, auditMempool); + const { censored, added, prioritized, fresh, sigop, fullrbf, accelerated, score, similarity } = Audit.auditBlock(transactions, projectedBlocks, auditMempool); const matchRate = Math.round(score * 100 * 100) / 100; const stripped = projectedBlocks[0]?.transactions ? projectedBlocks[0].transactions : []; @@ -895,6 +895,7 @@ class WebsocketHandler { height: block.height, hash: block.id, addedTxs: added, + prioritizedTxs: prioritized, missingTxs: censored, freshTxs: fresh, sigopTxs: sigop, diff --git a/backend/src/mempool.interfaces.ts b/backend/src/mempool.interfaces.ts index 3947ed916..58b78394d 100644 --- a/backend/src/mempool.interfaces.ts +++ b/backend/src/mempool.interfaces.ts @@ -37,6 +37,7 @@ export interface BlockAudit { sigopTxs: string[], fullrbfTxs: string[], addedTxs: string[], + prioritizedTxs: string[], acceleratedTxs: string[], matchRate: number, expectedFees?: number, diff --git a/backend/src/replication/AuditReplication.ts b/backend/src/replication/AuditReplication.ts index 503c61613..4ea629839 100644 --- a/backend/src/replication/AuditReplication.ts +++ b/backend/src/replication/AuditReplication.ts @@ -114,6 +114,7 @@ class AuditReplication { time: auditSummary.timestamp || auditSummary.time, missingTxs: auditSummary.missingTxs || [], addedTxs: auditSummary.addedTxs || [], + prioritizedTxs: auditSummary.prioritizedTxs || [], freshTxs: auditSummary.freshTxs || [], sigopTxs: auditSummary.sigopTxs || [], fullrbfTxs: auditSummary.fullrbfTxs || [], diff --git a/backend/src/repositories/BlocksAuditsRepository.ts b/backend/src/repositories/BlocksAuditsRepository.ts index 62f28c56f..daf1ba52d 100644 --- a/backend/src/repositories/BlocksAuditsRepository.ts +++ b/backend/src/repositories/BlocksAuditsRepository.ts @@ -6,9 +6,9 @@ import { BlockAudit, AuditScore } from '../mempool.interfaces'; class BlocksAuditRepositories { public async $saveAudit(audit: BlockAudit): Promise { try { - await DB.query(`INSERT INTO blocks_audits(time, height, hash, missing_txs, added_txs, fresh_txs, sigop_txs, fullrbf_txs, accelerated_txs, match_rate, expected_fees, expected_weight) - VALUE (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [audit.time, audit.height, audit.hash, JSON.stringify(audit.missingTxs), - JSON.stringify(audit.addedTxs), JSON.stringify(audit.freshTxs), JSON.stringify(audit.sigopTxs), JSON.stringify(audit.fullrbfTxs), JSON.stringify(audit.acceleratedTxs), audit.matchRate, audit.expectedFees, audit.expectedWeight]); + await DB.query(`INSERT INTO blocks_audits(time, height, hash, missing_txs, added_txs, prioritized_txs, fresh_txs, sigop_txs, fullrbf_txs, accelerated_txs, match_rate, expected_fees, expected_weight) + VALUE (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [audit.time, audit.height, audit.hash, JSON.stringify(audit.missingTxs), + JSON.stringify(audit.addedTxs), JSON.stringify(audit.prioritizedTxs), JSON.stringify(audit.freshTxs), JSON.stringify(audit.sigopTxs), JSON.stringify(audit.fullrbfTxs), JSON.stringify(audit.acceleratedTxs), audit.matchRate, audit.expectedFees, audit.expectedWeight]); } catch (e: any) { if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart logger.debug(`Cannot save block audit for block ${audit.hash} because it has already been indexed, ignoring`); @@ -66,6 +66,7 @@ class BlocksAuditRepositories { template, missing_txs as missingTxs, added_txs as addedTxs, + prioritized_txs as prioritizedTxs, fresh_txs as freshTxs, sigop_txs as sigopTxs, fullrbf_txs as fullrbfTxs, @@ -81,6 +82,7 @@ class BlocksAuditRepositories { if (rows.length) { rows[0].missingTxs = JSON.parse(rows[0].missingTxs); rows[0].addedTxs = JSON.parse(rows[0].addedTxs); + rows[0].prioritizedTxs = JSON.parse(rows[0].prioritizedTxs); rows[0].freshTxs = JSON.parse(rows[0].freshTxs); rows[0].sigopTxs = JSON.parse(rows[0].sigopTxs); rows[0].fullrbfTxs = JSON.parse(rows[0].fullrbfTxs); diff --git a/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts b/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts index f2a1f1c7c..003531fce 100644 --- a/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts +++ b/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts @@ -1,5 +1,5 @@ import { Component, ElementRef, ViewChild, HostListener, Input, Output, EventEmitter, NgZone, AfterViewInit, OnDestroy, OnChanges } from '@angular/core'; -import { TransactionStripped } from '../../interfaces/websocket.interface'; +import { TransactionStripped } from '../../interfaces/node-api.interface'; import { FastVertexArray } from './fast-vertex-array'; import BlockScene from './block-scene'; import TxSprite from './tx-sprite'; @@ -20,7 +20,7 @@ const unmatchedAuditColors = { censored: setOpacity(defaultAuditColors.censored, unmatchedOpacity), missing: setOpacity(defaultAuditColors.missing, unmatchedOpacity), added: setOpacity(defaultAuditColors.added, unmatchedOpacity), - selected: setOpacity(defaultAuditColors.selected, unmatchedOpacity), + prioritized: setOpacity(defaultAuditColors.prioritized, unmatchedOpacity), accelerated: setOpacity(defaultAuditColors.accelerated, unmatchedOpacity), }; diff --git a/frontend/src/app/components/block-overview-graph/block-scene.ts b/frontend/src/app/components/block-overview-graph/block-scene.ts index adcf736fc..5d2196f1e 100644 --- a/frontend/src/app/components/block-overview-graph/block-scene.ts +++ b/frontend/src/app/components/block-overview-graph/block-scene.ts @@ -1,6 +1,6 @@ import { FastVertexArray } from './fast-vertex-array'; import TxView from './tx-view'; -import { TransactionStripped } from '../../interfaces/websocket.interface'; +import { TransactionStripped } from '../../interfaces/node-api.interface'; import { Color, Position, Square, ViewUpdateParams } from './sprite-types'; import { defaultColorFunction } from './utils'; diff --git a/frontend/src/app/components/block-overview-graph/tx-view.ts b/frontend/src/app/components/block-overview-graph/tx-view.ts index fec0e7090..742c305f5 100644 --- a/frontend/src/app/components/block-overview-graph/tx-view.ts +++ b/frontend/src/app/components/block-overview-graph/tx-view.ts @@ -33,7 +33,7 @@ export default class TxView implements TransactionStripped { flags: number; bigintFlags?: bigint | null = 0b00000100_00000000_00000000_00000000n; time?: number; - status?: 'found' | 'missing' | 'sigop' | 'fresh' | 'freshcpfp' | 'added' | 'censored' | 'selected' | 'rbf' | 'accelerated'; + status?: 'found' | 'missing' | 'sigop' | 'fresh' | 'freshcpfp' | 'added' | 'prioritized' | 'censored' | 'selected' | 'rbf' | 'accelerated'; context?: 'projected' | 'actual'; scene?: BlockScene; diff --git a/frontend/src/app/components/block-overview-graph/utils.ts b/frontend/src/app/components/block-overview-graph/utils.ts index 9c800ad85..b6c8ccf5e 100644 --- a/frontend/src/app/components/block-overview-graph/utils.ts +++ b/frontend/src/app/components/block-overview-graph/utils.ts @@ -45,7 +45,7 @@ export const defaultAuditColors = { censored: hexToColor('f344df'), missing: darken(desaturate(hexToColor('f344df'), 0.3), 0.7), added: hexToColor('0099ff'), - selected: darken(desaturate(hexToColor('0099ff'), 0.3), 0.7), + prioritized: darken(desaturate(hexToColor('0099ff'), 0.3), 0.7), accelerated: hexToColor('8F5FF6'), }; @@ -81,6 +81,8 @@ export function defaultColorFunction( return auditColors.missing; case 'added': return auditColors.added; + case 'prioritized': + return auditColors.prioritized; case 'selected': return marginalFeeColors[feeLevelIndex] || marginalFeeColors[mempoolFeeColors.length - 1]; case 'accelerated': diff --git a/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html b/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html index 974c4c1db..20b7fc8c4 100644 --- a/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html +++ b/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html @@ -74,6 +74,7 @@ Recently broadcasted Recently CPFP'd Added + Prioritized Marginal fee rate Conflicting Accelerated diff --git a/frontend/src/app/components/block/block.component.ts b/frontend/src/app/components/block/block.component.ts index 2602c5ecd..8866a9d68 100644 --- a/frontend/src/app/components/block/block.component.ts +++ b/frontend/src/app/components/block/block.component.ts @@ -371,6 +371,7 @@ export class BlockComponent implements OnInit, OnDestroy { const inTemplate = {}; const inBlock = {}; const isAdded = {}; + const isPrioritized = {}; const isCensored = {}; const isMissing = {}; const isSelected = {}; @@ -394,6 +395,9 @@ export class BlockComponent implements OnInit, OnDestroy { for (const txid of blockAudit.addedTxs) { isAdded[txid] = true; } + for (const txid of blockAudit.prioritizedTxs) { + isPrioritized[txid] = true; + } for (const txid of blockAudit.missingTxs) { isCensored[txid] = true; } @@ -443,6 +447,8 @@ export class BlockComponent implements OnInit, OnDestroy { tx.status = null; } else if (isAdded[tx.txid]) { tx.status = 'added'; + } else if (isPrioritized[tx.txid]) { + tx.status = 'prioritized'; } else if (inTemplate[tx.txid]) { tx.status = 'found'; } else if (isRbf[tx.txid]) { diff --git a/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts b/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts index d7a63710f..ca5b3f452 100644 --- a/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts +++ b/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts @@ -1,6 +1,6 @@ import { HostListener, OnChanges, OnDestroy } from '@angular/core'; import { Component, Input, OnInit, ChangeDetectionStrategy } from '@angular/core'; -import { TransactionStripped } from '../../interfaces/websocket.interface'; +import { TransactionStripped } from '../../interfaces/node-api.interface'; import { StateService } from '../../services/state.service'; import { VbytesPipe } from '../../shared/pipes/bytes-pipe/vbytes.pipe'; import { selectPowerOfTen } from '../../bitcoin.utils'; diff --git a/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts b/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts index 29825491c..48cd6cccb 100644 --- a/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts +++ b/frontend/src/app/components/mempool-block-overview/mempool-block-overview.component.ts @@ -1,7 +1,8 @@ import { Component, ComponentRef, ViewChild, HostListener, Input, Output, EventEmitter, OnInit, OnDestroy, OnChanges, ChangeDetectionStrategy, ChangeDetectorRef, AfterViewInit } from '@angular/core'; import { StateService } from '../../services/state.service'; -import { MempoolBlockDelta, TransactionStripped } from '../../interfaces/websocket.interface'; +import { MempoolBlockDelta } from '../../interfaces/websocket.interface'; +import { TransactionStripped } from '../../interfaces/node-api.interface'; import { BlockOverviewGraphComponent } from '../../components/block-overview-graph/block-overview-graph.component'; import { Subscription, BehaviorSubject, merge, of, timer } from 'rxjs'; import { switchMap, filter, concatMap, map } from 'rxjs/operators'; diff --git a/frontend/src/app/components/mempool-block/mempool-block.component.ts b/frontend/src/app/components/mempool-block/mempool-block.component.ts index 7f41faffb..430a456ec 100644 --- a/frontend/src/app/components/mempool-block/mempool-block.component.ts +++ b/frontend/src/app/components/mempool-block/mempool-block.component.ts @@ -3,7 +3,8 @@ import { detectWebGL } from '../../shared/graphs.utils'; import { StateService } from '../../services/state.service'; import { ActivatedRoute, ParamMap } from '@angular/router'; import { switchMap, map, tap, filter } from 'rxjs/operators'; -import { MempoolBlock, TransactionStripped } from '../../interfaces/websocket.interface'; +import { MempoolBlock } from '../../interfaces/websocket.interface'; +import { TransactionStripped } from '../../interfaces/node-api.interface'; import { Observable, BehaviorSubject } from 'rxjs'; import { SeoService } from '../../services/seo.service'; import { seoDescriptionNetwork } from '../../shared/common.utils'; diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index f2a580d07..d211edaf2 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -77,8 +77,9 @@ Coinbase Expected in Block Seen in Mempool - Not seen in Mempool - Added + Not seen in Mempool + Added + Prioritized Conflict