diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index a1b7e26a5..eeda07c7d 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -1,6 +1,6 @@ name: Cypress Tests -on: [push] +on: [push, pull_request] jobs: cypress: diff --git a/backend/src/api/bitcoin/bitcoin-api.interface.ts b/backend/src/api/bitcoin/bitcoin-api.interface.ts index 194beebee..018d30223 100644 --- a/backend/src/api/bitcoin/bitcoin-api.interface.ts +++ b/backend/src/api/bitcoin/bitcoin-api.interface.ts @@ -113,4 +113,46 @@ export namespace IBitcoinApi { status: 'invalid' | 'headers-only' | 'valid-headers' | 'valid-fork' | 'active'; } + export interface BlockchainInfo { + chain: number; // (string) current network name as defined in BIP70 (main, test, regtest) + blocks: number; // (numeric) the current number of blocks processed in the server + headers: number; // (numeric) the current number of headers we have validated + bestblockhash: string, // (string) the hash of the currently best block + difficulty: number; // (numeric) the current difficulty + mediantime: number; // (numeric) median time for the current best block + verificationprogress: number; // (numeric) estimate of verification progress [0..1] + initialblockdownload: boolean; // (bool) (debug information) estimate of whether this node is in Initial Block Download mode. + chainwork: string // (string) total amount of work in active chain, in hexadecimal + size_on_disk: number; // (numeric) the estimated size of the block and undo files on disk + pruned: number; // (boolean) if the blocks are subject to pruning + pruneheight: number; // (numeric) lowest-height complete block stored (only present if pruning is enabled) + automatic_pruning: number; // (boolean) whether automatic pruning is enabled (only present if pruning is enabled) + prune_target_size: number; // (numeric) the target size used by pruning (only present if automatic pruning is enabled) + softforks: SoftFork[]; // (array) status of softforks in progress + bip9_softforks: { [name: string]: Bip9SoftForks[] } // (object) status of BIP9 softforks in progress + warnings: string; // (string) any network and blockchain warnings. + } + + interface SoftFork { + id: string; // (string) name of softfork + version: number; // (numeric) block version + reject: { // (object) progress toward rejecting pre-softfork blocks + status: boolean; // (boolean) true if threshold reached + }, + } + interface Bip9SoftForks { + status: number; // (string) one of defined, started, locked_in, active, failed + bit: number; // (numeric) the bit (0-28) in the block version field used to signal this softfork (only for started status) + startTime: number; // (numeric) the minimum median time past of a block at which the bit gains its meaning + timeout: number; // (numeric) the median time past of a block at which the deployment is considered failed if not yet locked in + since: number; // (numeric) height of the first block to which the status applies + statistics: { // (object) numeric statistics about BIP9 signalling for a softfork (only for started status) + period: number; // (numeric) the length in blocks of the BIP9 signalling period + threshold: number; // (numeric) the number of blocks with the version bit set required to activate the feature + elapsed: number; // (numeric) the number of blocks elapsed since the beginning of the current period + count: number; // (numeric) the number of blocks with the version bit set in the current period + possible: boolean; // (boolean) returns false if there are not enough blocks left in this period to pass activation threshold + } + } + } diff --git a/backend/src/api/bitcoin/bitcoin-base.api.ts b/backend/src/api/bitcoin/bitcoin-base.api.ts index 2384c92e2..a447da5fe 100644 --- a/backend/src/api/bitcoin/bitcoin-base.api.ts +++ b/backend/src/api/bitcoin/bitcoin-base.api.ts @@ -40,6 +40,10 @@ class BitcoinBaseApi { } return this.bitcoindClient.getMempoolInfo(); } + + $getBlockchainInfo(): Promise { + return this.bitcoindClient.getBlockchainInfo(); + } } export default new BitcoinBaseApi(); diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts index 32ad325ac..7896fb30d 100644 --- a/backend/src/api/blocks.ts +++ b/backend/src/api/blocks.ts @@ -6,6 +6,7 @@ import { BlockExtended, TransactionExtended } from '../mempool.interfaces'; import { Common } from './common'; import diskCache from './disk-cache'; import transactionUtils from './transaction-utils'; +import bitcoinBaseApi from './bitcoin/bitcoin-base.api'; class Blocks { private blocks: BlockExtended[] = []; @@ -44,15 +45,21 @@ class Blocks { } if (!this.lastDifficultyAdjustmentTime) { - const heightDiff = blockHeightTip % 2016; - const blockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff); - const block = await bitcoinApi.$getBlock(blockHash); - this.lastDifficultyAdjustmentTime = block.timestamp; - this.currentDifficulty = block.difficulty; + const blockchainInfo = await bitcoinBaseApi.$getBlockchainInfo(); + if (blockchainInfo.blocks === blockchainInfo.headers) { + const heightDiff = blockHeightTip % 2016; + const blockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff); + const block = await bitcoinApi.$getBlock(blockHash); + this.lastDifficultyAdjustmentTime = block.timestamp; + this.currentDifficulty = block.difficulty; - const previousPeriodBlockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff - 2016); - const previousPeriodBlock = await bitcoinApi.$getBlock(previousPeriodBlockHash); - this.previousDifficultyRetarget = (block.difficulty - previousPeriodBlock.difficulty) / previousPeriodBlock.difficulty * 100; + const previousPeriodBlockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff - 2016); + const previousPeriodBlock = await bitcoinApi.$getBlock(previousPeriodBlockHash); + this.previousDifficultyRetarget = (block.difficulty - previousPeriodBlock.difficulty) / previousPeriodBlock.difficulty * 100; + logger.debug(`Initial difficulty adjustment data set.`); + } else { + logger.debug(`Blockchain headers (${blockchainInfo.headers}) and blocks (${blockchainInfo.blocks}) not in sync. Waiting...`); + } } while (this.currentBlockHeight < blockHeightTip) { diff --git a/frontend/cypress/integration/liquid/liquid.spec.ts b/frontend/cypress/integration/liquid/liquid.spec.ts index 585513e21..5e6dd8486 100644 --- a/frontend/cypress/integration/liquid/liquid.spec.ts +++ b/frontend/cypress/integration/liquid/liquid.spec.ts @@ -133,6 +133,13 @@ describe('Liquid', () => { cy.get('.error-unblinded' ).contains('Error: Invalid blinding data.'); }); + it('shows asset peg in/out and burn transactions', () => { + cy.visit('/liquid/asset/6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d'); + cy.waitForSkeletonGone(); + cy.get('#table-tx-vout tr').not('.assetBox'); + cy.get('#table-tx-vin tr').not('.assetBox'); + }); + it('prevents regressing issue #644', () => { cy.visit('/liquid/tx/393b890966f305e7c440fcfb12a13f51a7a9011cc59ff5f14f6f93214261bd82'); cy.waitForSkeletonGone(); diff --git a/frontend/cypress/integration/mainnet/mainnet.spec.ts b/frontend/cypress/integration/mainnet/mainnet.spec.ts index c9515cba8..91cce9868 100644 --- a/frontend/cypress/integration/mainnet/mainnet.spec.ts +++ b/frontend/cypress/integration/mainnet/mainnet.spec.ts @@ -1,4 +1,4 @@ -import { emitMempoolInfo } from "../../support/websocket"; +import { emitMempoolInfo, emitWithoutMempoolInfo } from "../../support/websocket"; describe('Mainnet', () => { beforeEach(() => { @@ -51,6 +51,7 @@ describe('Mainnet', () => { loaded: true } }); + cy.get(':nth-child(1) > #bitcoin-block-0').should('not.exist'); cy.get(':nth-child(2) > #bitcoin-block-0').should('not.exist'); cy.get(':nth-child(3) > #bitcoin-block-0').should('not.exist'); @@ -72,28 +73,24 @@ describe('Mainnet', () => { }); }); - describe('tv mode', () => { - it('loads the tv screen - desktop', () => { + it('loads the tv screen - desktop', () => { + cy.viewport('macbook-16'); + cy.visit('/'); + cy.waitForSkeletonGone(); + cy.get('li:nth-of-type(4) > a').click().then(() => { cy.viewport('macbook-16'); - cy.visit('/'); - cy.waitForSkeletonGone(); - cy.get('li:nth-of-type(4) > a').click().then(() => { - cy.viewport('macbook-16'); - cy.get('.chart-holder'); - cy.get('.blockchain-wrapper').should('be.visible'); - cy.get('#mempool-block-0').should('be.visible'); - }); + cy.get('.chart-holder'); + cy.get('.blockchain-wrapper').should('be.visible'); + cy.get('#mempool-block-0').should('be.visible'); }); + }); - it('loads the tv screen - mobile', () => { - cy.visit('/'); - cy.waitForSkeletonGone(); - cy.get('li:nth-of-type(4) > a').click().then(() => { - cy.viewport('iphone-6'); - cy.get('.chart-holder'); - cy.get('.blockchain-wrapper').should('not.be.visible'); - }); - }); + it('loads the tv screen - mobile', () => { + cy.viewport('iphone-6'); + cy.visit('/tv'); + cy.waitForSkeletonGone(); + cy.get('.chart-holder'); + cy.get('.blockchain-wrapper').should('be.visible'); }); it('loads the api screen', () => { diff --git a/frontend/cypress/support/websocket.ts b/frontend/cypress/support/websocket.ts index 74b065116..ce971fae9 100644 --- a/frontend/cypress/support/websocket.ts +++ b/frontend/cypress/support/websocket.ts @@ -70,15 +70,15 @@ export const emitMempoolInfo = ({ default: win.mockSocket.send('{"action":"init"}'); win.mockSocket.send('{"action":"want","data":["blocks","stats","mempool-blocks","live-2h-chart"]}'); - cy.readFile('cypress/fixtures/mainnet_mempoolInfo.json', 'ascii').then((fixture) => { - win.mockSocket.send(JSON.stringify(fixture)); - }); win.mockSocket.send('{"conversions":{"USD":32365.338815782445}}'); cy.readFile('cypress/fixtures/mainnet_live2hchart.json', 'ascii').then((fixture) => { win.mockSocket.send(JSON.stringify(fixture)); }); + cy.readFile('cypress/fixtures/mainnet_mempoolInfo.json', 'ascii').then((fixture) => { + win.mockSocket.send(JSON.stringify(fixture)); + }); } }); cy.waitForSkeletonGone(); return cy.get('#mempool-block-0'); -}; +}; \ No newline at end of file diff --git a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html index 99b8d4cce..dd74114c2 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html @@ -1,4 +1,4 @@ -
+
  @@ -9,7 +9,7 @@
~{{ block.medianFee | number:'1.0-0' }} sat/vB
-
+
{{ block.feeRange[1] | number:'1.0-0' }} - {{ block.feeRange[block.feeRange.length - 1] | number:'1.0-0' }} sat/vB
@@ -25,7 +25,7 @@
-
+
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 e227cb8cd..acf9a5f23 100644 --- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts +++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef, Input } from '@angular/core'; -import { Subscription, Observable } from 'rxjs'; +import { Subscription } from 'rxjs'; import { Block } from 'src/app/interfaces/electrs.interface'; import { StateService } from 'src/app/services/state.service'; import { Router } from '@angular/router'; @@ -11,8 +11,7 @@ import { Router } from '@angular/router'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class BlockchainBlocksComponent implements OnInit, OnDestroy { - @Input() isLoading$: Observable; - + network = ''; blocks: Block[] = this.mountEmptyBlocks(); markHeight: number; @@ -23,6 +22,7 @@ export class BlockchainBlocksComponent implements OnInit, OnDestroy { blockStyles = []; interval: any; tabHidden = false; + loadingBlocks = false; arrowVisible = false; arrowLeftPx = 30; @@ -54,6 +54,8 @@ export class BlockchainBlocksComponent implements OnInit, OnDestroy { return; } + this.loadingBlocks = true; + if (this.blocks.length && block.height !== this.blocks[0].height + 1) { this.blocks = []; this.blocksFilled = false; diff --git a/frontend/src/app/components/blockchain/blockchain.component.html b/frontend/src/app/components/blockchain/blockchain.component.html index 94361f4a4..04f71e130 100644 --- a/frontend/src/app/components/blockchain/blockchain.component.html +++ b/frontend/src/app/components/blockchain/blockchain.component.html @@ -1,8 +1,8 @@
- - + +
diff --git a/frontend/src/app/components/blockchain/blockchain.component.ts b/frontend/src/app/components/blockchain/blockchain.component.ts index 62cc8d276..f17569e27 100644 --- a/frontend/src/app/components/blockchain/blockchain.component.ts +++ b/frontend/src/app/components/blockchain/blockchain.component.ts @@ -1,6 +1,5 @@ import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core'; import { StateService } from 'src/app/services/state.service'; -import { Observable } from 'rxjs'; @Component({ selector: 'app-blockchain', @@ -9,7 +8,6 @@ import { Observable } from 'rxjs'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class BlockchainComponent implements OnInit { - isLoading$: Observable; network: string; constructor( @@ -17,7 +15,6 @@ export class BlockchainComponent implements OnInit { ) {} ngOnInit() { - this.isLoading$ = this.stateService.isLoadingWebSocket$; this.network = this.stateService.network; } } diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html index 97f47432f..a06b5acc1 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html @@ -1,4 +1,4 @@ -
+
@@ -21,7 +21,7 @@ - +
@@ -38,7 +38,7 @@
-
+
diff --git a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts index da94d59a6..5e288d004 100644 --- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts +++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts @@ -13,7 +13,6 @@ import { feeLevels, mempoolFeeColors } from 'src/app/app.constants'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class MempoolBlocksComponent implements OnInit, OnDestroy { - @Input() isLoading$: Observable; mempoolBlocks: MempoolBlock[] = this.mountEmptyBlocks(); mempoolBlocks$: Observable; @@ -31,6 +30,7 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { blockPadding = 30; arrowVisible = false; tabHidden = false; + loadingMempoolBlocks = true; rightPosition = 0; transition = '2s'; @@ -106,6 +106,7 @@ export class MempoolBlocksComponent implements OnInit, OnDestroy { timeAvgMins += Math.abs(timeAvgDiff); } + this.loadingMempoolBlocks = false; return timeAvgMins * 60 * 1000; }) ); diff --git a/frontend/src/app/components/television/television.component.html b/frontend/src/app/components/television/television.component.html index 404e10ece..e8a423b0b 100644 --- a/frontend/src/app/components/television/television.component.html +++ b/frontend/src/app/components/television/television.component.html @@ -12,8 +12,8 @@
- - + +
diff --git a/frontend/src/app/components/television/television.component.scss b/frontend/src/app/components/television/television.component.scss index 48a83e1a1..f45908655 100644 --- a/frontend/src/app/components/television/television.component.scss +++ b/frontend/src/app/components/television/television.component.scss @@ -89,9 +89,4 @@ display: flex; margin-top: 0px; flex-direction: column; - @media(max-height: 700px) { - .blockchain-wrapper{ - display: none !important; - } - } } \ No newline at end of file diff --git a/frontend/src/app/components/television/television.component.ts b/frontend/src/app/components/television/television.component.ts index 7ed56d663..ae5d9abfd 100644 --- a/frontend/src/app/components/television/television.component.ts +++ b/frontend/src/app/components/television/television.component.ts @@ -12,7 +12,6 @@ import { Observable } from 'rxjs'; styleUrls: ['./television.component.scss'] }) export class TelevisionComponent implements OnInit { - isLoading$: Observable; mempoolStats: OptimizedMempoolStats[] = []; mempoolVsizeFeesData: any; @@ -27,7 +26,6 @@ export class TelevisionComponent implements OnInit { ngOnInit() { this.seoService.setTitle($localize`:@@46ce8155c9ab953edeec97e8950b5a21e67d7c4e:TV view`); this.websocketService.want(['blocks', 'live-2h-chart', 'mempool-blocks']); - this.isLoading$ = this.stateService.isLoadingWebSocket$; this.apiService.list2HStatistics$() .subscribe((mempoolStats) => { diff --git a/frontend/src/app/components/time-until/time-until.component.ts b/frontend/src/app/components/time-until/time-until.component.ts index 6e836f1b1..9279260fe 100644 --- a/frontend/src/app/components/time-until/time-until.component.ts +++ b/frontend/src/app/components/time-until/time-until.component.ts @@ -15,6 +15,7 @@ export class TimeUntilComponent implements OnInit, OnChanges, OnDestroy { @Input() time: number; @Input() fastRender = false; @Input() fixedRender = false; + @Input() forceFloorOnTimeIntervals: string[]; constructor( private ref: ChangeDetectorRef, @@ -67,10 +68,10 @@ export class TimeUntilComponent implements OnInit, OnChanges, OnDestroy { let counter: number; for (const i in this.intervals) { if (this.intervals.hasOwnProperty(i)) { - if (i === 'minute') { - counter = Math.round(seconds / this.intervals[i]); - } else { + if (this.forceFloorOnTimeIntervals && this.forceFloorOnTimeIntervals.indexOf(i) > -1) { counter = Math.floor(seconds / this.intervals[i]); + } else { + counter = Math.round(seconds / this.intervals[i]); } const dateStrings = dates(counter); if (counter > 0) { diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index 4dbac16bc..88d85fe87 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -120,7 +120,7 @@
- + diff --git a/frontend/src/app/components/transactions-list/transactions-list.component.html b/frontend/src/app/components/transactions-list/transactions-list.component.html index 9768952d0..af2bf2c1e 100644 --- a/frontend/src/app/components/transactions-list/transactions-list.component.html +++ b/frontend/src/app/components/transactions-list/transactions-list.component.html @@ -21,7 +21,7 @@ - +
@@ -122,7 +122,7 @@ - +
{{ vout.scriptpubkey_address | shortenString : 16 }} diff --git a/frontend/src/locale/messages.ar.xlf b/frontend/src/locale/messages.ar.xlf index 4e890e7e8..41054e257 100644 --- a/frontend/src/locale/messages.ar.xlf +++ b/frontend/src/locale/messages.ar.xlf @@ -1583,6 +1583,7 @@ General + عام src/app/components/api-docs/api-docs.component.html 9,11 @@ -3372,6 +3373,7 @@ In ~ + في ~ src/app/components/time-until/time-until.component.ts 65 @@ -3880,9 +3882,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates - الرسوم المتوقعه + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3891,7 +3892,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4017,7 +4018,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4030,28 +4031,28 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period الفترة الحالية src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period @@ -4137,6 +4138,7 @@ minute + دقيقه src/app/shared/i18n/dates.ts 13 diff --git a/frontend/src/locale/messages.ca.xlf b/frontend/src/locale/messages.ca.xlf index b0154a8d8..bc8790283 100644 --- a/frontend/src/locale/messages.ca.xlf +++ b/frontend/src/locale/messages.ca.xlf @@ -3739,8 +3739,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3749,7 +3749,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -3865,7 +3865,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -3877,27 +3877,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.cs.xlf b/frontend/src/locale/messages.cs.xlf index 313a412d3..e94d95603 100644 --- a/frontend/src/locale/messages.cs.xlf +++ b/frontend/src/locale/messages.cs.xlf @@ -3875,8 +3875,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3885,7 +3885,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4009,7 +4009,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4021,27 +4021,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.de.xlf b/frontend/src/locale/messages.de.xlf index d2920d483..b1c180ee6 100644 --- a/frontend/src/locale/messages.de.xlf +++ b/frontend/src/locale/messages.de.xlf @@ -3885,9 +3885,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates - Gebührenschätzungen + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3896,7 +3895,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4022,7 +4021,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4035,29 +4034,28 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % - Vorige: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period Laufende Periode src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.en_US.xlf b/frontend/src/locale/messages.en_US.xlf index 1df37d2f1..03d0c1627 100644 --- a/frontend/src/locale/messages.en_US.xlf +++ b/frontend/src/locale/messages.en_US.xlf @@ -3572,8 +3572,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3582,7 +3582,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -3695,7 +3695,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -3707,27 +3707,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.es.xlf b/frontend/src/locale/messages.es.xlf index 76720c175..5d9041411 100644 --- a/frontend/src/locale/messages.es.xlf +++ b/frontend/src/locale/messages.es.xlf @@ -3885,9 +3885,9 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates - Estimaciones de Tasas + + Transaction Fees + Tasa de Transacción src/app/dashboard/dashboard.component.html 6,9 @@ -3896,7 +3896,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4022,7 +4022,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4035,29 +4035,29 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % - Anterior: % + + Previous + Previo src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period Período Actual src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.fa.xlf b/frontend/src/locale/messages.fa.xlf index c2f46813c..ea3adf28b 100644 --- a/frontend/src/locale/messages.fa.xlf +++ b/frontend/src/locale/messages.fa.xlf @@ -1583,6 +1583,7 @@ General + عمومی src/app/components/api-docs/api-docs.component.html 9,11 @@ -1933,6 +1934,7 @@ Returns details about difficulty adjustment. + جزئیات مربوط به تنظیم سختی را برمی‌گرداند. src/app/components/api-docs/api-docs.component.html 24,26 @@ -2050,6 +2052,7 @@ Returns the hex-encoded block header. + سربرگ بلاک کد شده به صورت hex را برمی‌گرداند. src/app/components/api-docs/api-docs.component.html 230,233 @@ -2841,6 +2844,7 @@ Block Header Hex + سربرگ بلاک به صورت Hex src/app/components/block/block.component.html 118,119 @@ -2987,6 +2991,7 @@ blocks + بلاک src/app/components/footer/footer.component.html 22,23 @@ -3003,6 +3008,7 @@ block + بلاک src/app/components/footer/footer.component.html 23,24 @@ -3242,6 +3248,7 @@ Just now + همین الان src/app/components/time-since/time-since.component.ts 57 @@ -3253,6 +3260,7 @@ ago + پیش src/app/components/time-since/time-since.component.ts 67 @@ -3312,6 +3320,7 @@ After + بعد از src/app/components/time-span/time-span.component.ts 67 @@ -3371,6 +3380,7 @@ In ~ + در حدود src/app/components/time-until/time-until.component.ts 65 @@ -3879,8 +3889,9 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees + کارمزد تراکنش‌ها src/app/dashboard/dashboard.component.html 6,9 @@ -3889,7 +3900,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -3999,6 +4010,7 @@ Difficulty Adjustment + تنظیم سختی بلاک‌ها src/app/dashboard/dashboard.component.html 202,205 @@ -4007,50 +4019,55 @@ Remaining + باقیمانده src/app/dashboard/dashboard.component.html 208,210 src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining Estimate + تخمین src/app/dashboard/dashboard.component.html 217,218 src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous + قبلی src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period + دوره فعلی src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period year + سال src/app/shared/i18n/dates.ts 3 @@ -4058,6 +4075,7 @@ years + سال src/app/shared/i18n/dates.ts 4 @@ -4065,6 +4083,7 @@ month + ماه src/app/shared/i18n/dates.ts 5 @@ -4072,6 +4091,7 @@ months + ماه src/app/shared/i18n/dates.ts 6 @@ -4079,6 +4099,7 @@ week + هفته src/app/shared/i18n/dates.ts 7 @@ -4086,6 +4107,7 @@ weeks + هفته src/app/shared/i18n/dates.ts 8 @@ -4093,6 +4115,7 @@ day + روز src/app/shared/i18n/dates.ts 9 @@ -4100,6 +4123,7 @@ days + روز src/app/shared/i18n/dates.ts 10 @@ -4107,6 +4131,7 @@ hour + ساعت src/app/shared/i18n/dates.ts 11 @@ -4114,6 +4139,7 @@ hours + ساعت src/app/shared/i18n/dates.ts 12 @@ -4121,6 +4147,7 @@ minute + دقیقه src/app/shared/i18n/dates.ts 13 @@ -4128,6 +4155,7 @@ minutes + دقیقه src/app/shared/i18n/dates.ts 14 @@ -4135,6 +4163,7 @@ second + ثانیه src/app/shared/i18n/dates.ts 15 @@ -4142,6 +4171,7 @@ seconds + ثانیه src/app/shared/i18n/dates.ts 16 diff --git a/frontend/src/locale/messages.fi.xlf b/frontend/src/locale/messages.fi.xlf index 47ef507f9..675484663 100644 --- a/frontend/src/locale/messages.fi.xlf +++ b/frontend/src/locale/messages.fi.xlf @@ -3885,9 +3885,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates - Siirtokulu arviot + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3896,7 +3895,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4022,7 +4021,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4035,29 +4034,28 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % - Edellinen:% + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period Nykyinen jakso src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.fr.xlf b/frontend/src/locale/messages.fr.xlf index be96a1004..28bf331ea 100644 --- a/frontend/src/locale/messages.fr.xlf +++ b/frontend/src/locale/messages.fr.xlf @@ -3812,8 +3812,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3822,7 +3822,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -3946,7 +3946,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -3958,27 +3958,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.he.xlf b/frontend/src/locale/messages.he.xlf index 1c0575ff1..78275da27 100644 --- a/frontend/src/locale/messages.he.xlf +++ b/frontend/src/locale/messages.he.xlf @@ -3853,9 +3853,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates - עמלה מוערכת + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3864,7 +3863,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -3990,7 +3989,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4003,28 +4002,28 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period מחזור נוכחי src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.hi.xlf b/frontend/src/locale/messages.hi.xlf index e176a610a..efbee3c9f 100644 --- a/frontend/src/locale/messages.hi.xlf +++ b/frontend/src/locale/messages.hi.xlf @@ -3744,8 +3744,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3754,7 +3754,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -3867,7 +3867,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -3879,27 +3879,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.hr.xlf b/frontend/src/locale/messages.hr.xlf index 93b784e49..844715093 100644 --- a/frontend/src/locale/messages.hr.xlf +++ b/frontend/src/locale/messages.hr.xlf @@ -3589,8 +3589,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3599,7 +3599,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -3712,7 +3712,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -3724,27 +3724,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.hu.xlf b/frontend/src/locale/messages.hu.xlf index 8c67a724e..85d2a60c3 100644 --- a/frontend/src/locale/messages.hu.xlf +++ b/frontend/src/locale/messages.hu.xlf @@ -3880,9 +3880,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates - Díj becslések + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3891,7 +3890,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4017,7 +4016,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4030,28 +4029,28 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period Mostani Periódus src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.it.xlf b/frontend/src/locale/messages.it.xlf index eba782d8d..a3103bebb 100644 --- a/frontend/src/locale/messages.it.xlf +++ b/frontend/src/locale/messages.it.xlf @@ -3876,8 +3876,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3886,7 +3886,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4010,7 +4010,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4022,27 +4022,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.ja.xlf b/frontend/src/locale/messages.ja.xlf index ea8baa35b..355749231 100644 --- a/frontend/src/locale/messages.ja.xlf +++ b/frontend/src/locale/messages.ja.xlf @@ -3875,8 +3875,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3885,7 +3885,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4009,7 +4009,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4021,27 +4021,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.ka.xlf b/frontend/src/locale/messages.ka.xlf index 46dec9822..d7eb05bd4 100644 --- a/frontend/src/locale/messages.ka.xlf +++ b/frontend/src/locale/messages.ka.xlf @@ -3727,8 +3727,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3737,7 +3737,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -3861,7 +3861,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -3873,27 +3873,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.ko.xlf b/frontend/src/locale/messages.ko.xlf index 574cec3de..a6ee4c0d0 100644 --- a/frontend/src/locale/messages.ko.xlf +++ b/frontend/src/locale/messages.ko.xlf @@ -3885,8 +3885,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3895,7 +3895,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4019,7 +4019,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4031,27 +4031,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.nb.xlf b/frontend/src/locale/messages.nb.xlf index 392abd834..0450d774c 100644 --- a/frontend/src/locale/messages.nb.xlf +++ b/frontend/src/locale/messages.nb.xlf @@ -1583,6 +1583,7 @@ General + Generell src/app/components/api-docs/api-docs.component.html 9,11 @@ -1933,6 +1934,7 @@ Returns details about difficulty adjustment. + Returnerer detaljer om vanskelighetsgradjustering. src/app/components/api-docs/api-docs.component.html 24,26 @@ -2046,6 +2048,7 @@ Returns the hex-encoded block header. + Returnerer den hex-enkodede blokkheaderen. src/app/components/api-docs/api-docs.component.html 230,233 @@ -2837,6 +2840,7 @@ Block Header Hex + Blokkheader Hex src/app/components/block/block.component.html 118,119 @@ -2983,6 +2987,7 @@ blocks + blokker src/app/components/footer/footer.component.html 22,23 @@ -2999,6 +3004,7 @@ block + blokk src/app/components/footer/footer.component.html 23,24 @@ -3238,6 +3244,7 @@ Just now + Akkurat nå src/app/components/time-since/time-since.component.ts 57 @@ -3249,6 +3256,7 @@ ago + siden src/app/components/time-since/time-since.component.ts 67 @@ -3308,6 +3316,7 @@ After + Etter src/app/components/time-span/time-span.component.ts 67 @@ -3367,6 +3376,7 @@ In ~ + Om ~ src/app/components/time-until/time-until.component.ts 65 @@ -3875,8 +3885,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3885,7 +3895,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -3995,6 +4005,7 @@ Difficulty Adjustment + Vanskelighetsgradjustering src/app/dashboard/dashboard.component.html 202,205 @@ -4003,50 +4014,54 @@ Remaining + Gjenstående src/app/dashboard/dashboard.component.html 208,210 src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining Estimate + Anslag src/app/dashboard/dashboard.component.html 217,218 src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period + Nåværende periode src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period year + år src/app/shared/i18n/dates.ts 3 @@ -4054,6 +4069,7 @@ years + år src/app/shared/i18n/dates.ts 4 @@ -4061,6 +4077,7 @@ month + måned src/app/shared/i18n/dates.ts 5 @@ -4068,6 +4085,7 @@ months + måneder src/app/shared/i18n/dates.ts 6 @@ -4075,6 +4093,7 @@ week + uke src/app/shared/i18n/dates.ts 7 @@ -4082,6 +4101,7 @@ weeks + uker src/app/shared/i18n/dates.ts 8 @@ -4089,6 +4109,7 @@ day + dag src/app/shared/i18n/dates.ts 9 @@ -4096,6 +4117,7 @@ days + dager src/app/shared/i18n/dates.ts 10 @@ -4103,6 +4125,7 @@ hour + time src/app/shared/i18n/dates.ts 11 @@ -4110,6 +4133,7 @@ hours + timer src/app/shared/i18n/dates.ts 12 @@ -4117,6 +4141,7 @@ minute + minutt src/app/shared/i18n/dates.ts 13 @@ -4124,6 +4149,7 @@ minutes + minutter src/app/shared/i18n/dates.ts 14 @@ -4131,6 +4157,7 @@ second + sekund src/app/shared/i18n/dates.ts 15 @@ -4138,6 +4165,7 @@ seconds + sekunder src/app/shared/i18n/dates.ts 16 diff --git a/frontend/src/locale/messages.nl.xlf b/frontend/src/locale/messages.nl.xlf index 2c0a4f8ee..4ed4a19c5 100644 --- a/frontend/src/locale/messages.nl.xlf +++ b/frontend/src/locale/messages.nl.xlf @@ -3872,8 +3872,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3882,7 +3882,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4006,7 +4006,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4018,27 +4018,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.pl.xlf b/frontend/src/locale/messages.pl.xlf index 87b76613e..28e30537d 100644 --- a/frontend/src/locale/messages.pl.xlf +++ b/frontend/src/locale/messages.pl.xlf @@ -3875,8 +3875,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3885,7 +3885,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4009,7 +4009,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4021,27 +4021,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.pt.xlf b/frontend/src/locale/messages.pt.xlf index 76b9fc543..33d7b274c 100644 --- a/frontend/src/locale/messages.pt.xlf +++ b/frontend/src/locale/messages.pt.xlf @@ -3885,9 +3885,9 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates - Estimativa de Taxas + + Transaction Fees + Taxa de Transação src/app/dashboard/dashboard.component.html 6,9 @@ -3896,7 +3896,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4022,7 +4022,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4035,29 +4035,29 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % - Anterior: % + + Previous + Anterior src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period Período Atual src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.ru.xlf b/frontend/src/locale/messages.ru.xlf index ad5f83b15..3ae19dc85 100644 --- a/frontend/src/locale/messages.ru.xlf +++ b/frontend/src/locale/messages.ru.xlf @@ -3879,8 +3879,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3889,7 +3889,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4013,7 +4013,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4025,27 +4025,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.sl.xlf b/frontend/src/locale/messages.sl.xlf index 7349a979e..609e880b0 100644 --- a/frontend/src/locale/messages.sl.xlf +++ b/frontend/src/locale/messages.sl.xlf @@ -3880,9 +3880,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates - Ocena omrežnine + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3891,7 +3890,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4017,7 +4016,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4030,28 +4029,28 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period Trenutno obdobje src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.sv.xlf b/frontend/src/locale/messages.sv.xlf index f3604e924..b1453619c 100644 --- a/frontend/src/locale/messages.sv.xlf +++ b/frontend/src/locale/messages.sv.xlf @@ -3885,9 +3885,9 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates - Avgiftsestimat + + Transaction Fees + Transaktionsavgifter src/app/dashboard/dashboard.component.html 6,9 @@ -3896,7 +3896,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4022,7 +4022,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4035,29 +4035,29 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % - Föregående: % + + Previous + Föregående src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period Nuvarande period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.tr.xlf b/frontend/src/locale/messages.tr.xlf index 5f4715579..2e2b4f800 100644 --- a/frontend/src/locale/messages.tr.xlf +++ b/frontend/src/locale/messages.tr.xlf @@ -3876,8 +3876,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3886,7 +3886,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4010,7 +4010,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4022,27 +4022,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.uk.xlf b/frontend/src/locale/messages.uk.xlf index 755ae7f04..2c6e3f64b 100644 --- a/frontend/src/locale/messages.uk.xlf +++ b/frontend/src/locale/messages.uk.xlf @@ -3867,8 +3867,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3877,7 +3877,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4001,7 +4001,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4013,27 +4013,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.vi.xlf b/frontend/src/locale/messages.vi.xlf index 856ab7a20..5e860ef5a 100644 --- a/frontend/src/locale/messages.vi.xlf +++ b/frontend/src/locale/messages.vi.xlf @@ -3872,8 +3872,8 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates + + Transaction Fees src/app/dashboard/dashboard.component.html 6,9 @@ -3882,7 +3882,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -4006,7 +4006,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -4018,27 +4018,27 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period diff --git a/frontend/src/locale/messages.zh.xlf b/frontend/src/locale/messages.zh.xlf index df6c96dff..eb79dd89c 100644 --- a/frontend/src/locale/messages.zh.xlf +++ b/frontend/src/locale/messages.zh.xlf @@ -3301,6 +3301,7 @@ In ~ + ~ src/app/components/time-until/time-until.component.ts 65 @@ -3801,9 +3802,9 @@ TX Fee Rating is Warning tx-fee-rating.overpaid.warning - - Fee Estimates - 费用估算 + + Transaction Fees + 交易费用 src/app/dashboard/dashboard.component.html 6,9 @@ -3812,7 +3813,7 @@ src/app/dashboard/dashboard.component.html 33,36 - fees-box.fee-estimates + fees-box.transaction-fees Latest blocks @@ -3938,7 +3939,7 @@ src/app/dashboard/dashboard.component.html - 238,241 + 255,258 difficulty-box.remaining @@ -3951,28 +3952,29 @@ src/app/dashboard/dashboard.component.html - 245,248 + 262,265 difficulty-box.estimate - - Previous: % + + Previous + 前一段 src/app/dashboard/dashboard.component.html - 219,220 + 228,229 - difficulty-box.previous-retarget + difficulty-box.previous Current Period 本期 src/app/dashboard/dashboard.component.html - 222,223 + 239,240 src/app/dashboard/dashboard.component.html - 252,255 + 269,272 difficulty-box.current-period @@ -4058,6 +4060,7 @@ minute + 分钟 src/app/shared/i18n/dates.ts 13 diff --git a/production/electrs-start-liquid b/production/electrs-start-liquid index eb1d7a171..7380eaa02 100755 --- a/production/electrs-start-liquid +++ b/production/electrs-start-liquid @@ -18,6 +18,7 @@ do --bin electrs \ -- \ -vvv \ + --asset-db-path "$HOME/asset_registry_db" \ --address-search \ --cors '*' \ --network liquid \