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

Merge branch 'master' into hunicus/footer-refinement-exp

Browse Source
This commit is contained in:
wiz
2023-08-10 15:51:07 +09:00
committed by GitHub
parent d4f9600ff1 7191ca6915
commit db90e77a32
33 changed files with 526 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/cypress/support/commands.ts
View File

@@ -42,9 +42,6 @@
// -- This will overwrite an existing command --
// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
'use strict'
import 'cypress-wait-until';
import { PageIdleDetector } from './PageIdleDetector';
import { mockWebSocket } from './websocket';

1
frontend/cypress/support/e2e.ts
View File

@@ -14,6 +14,7 @@
// ***********************************************************
// When a command from ./commands is ready to use, import with `import './commands'` syntax
import 'cypress-wait-until';
import './commands';
import failOnConsoleError from 'cypress-fail-on-console-error';

2
frontend/cypress/tsconfig.json
View File

@@ -2,7 +2,7 @@
"extends": "../tsconfig.json",
"include": ["**/*.ts"],
"compilerOptions": {
"types": ["cypress"],
"types": ["cypress", "node", "cypress-wait-until"],
"lib": ["es2015", "dom"],
"allowJs": true,
"noEmit": true,

54
frontend/package-lock.json generated
View File

@@ -58,9 +58,10 @@
},
"optionalDependencies": {
"@cypress/schematic": "^2.5.0",
"cypress": "^12.17.1",
"@types/cypress": "^1.1.3",
"cypress": "^12.17.2",
"cypress-fail-on-console-error": "~4.0.3",
"cypress-wait-until": "^1.7.2",
"cypress-wait-until": "^2.0.0",
"mock-socket": "~9.2.1",
"start-server-and-test": "~2.0.0"
}
@@ -3925,6 +3926,16 @@
"@types/node": "*"
}
},
"node_modules/@types/cypress": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/@types/cypress/-/cypress-1.1.3.tgz",
"integrity": "sha512-OXe0Gw8LeCflkG1oPgFpyrYWJmEKqYncBsD/J0r17r0ETx/TnIGDNLwXt/pFYSYuYTpzcq1q3g62M9DrfsBL4g==",
"deprecated": "This is a stub types definition for cypress (https://cypress.io). cypress provides its own type definitions, so you don't need @types/cypress installed!",
"optional": true,
"dependencies": {
"cypress": "*"
}
},
"node_modules/@types/eslint": {
"version": "8.4.1",
"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
@@ -6641,9 +6652,9 @@
"peer": true
},
"node_modules/cypress": {
"version": "12.17.1",
"resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.1.tgz",
"integrity": "sha512-eKfBgO6t8waEyhegL4gxD7tcI6uTCGttu+ZU7y9Hq8BlpMztd7iLeIF4AJFAnbZH1xjX+wwgg4cRKFNSvv3VWQ==",
"version": "12.17.2",
"resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.2.tgz",
"integrity": "sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==",
"hasInstallScript": true,
"optional": true,
"dependencies": {
@@ -6710,10 +6721,14 @@
}
},
"node_modules/cypress-wait-until": {
"version": "1.7.2",
"resolved": "https://registry.npmjs.org/cypress-wait-until/-/cypress-wait-until-1.7.2.tgz",
"integrity": "sha512-uZ+M8/MqRcpf+FII/UZrU7g1qYZ4aVlHcgyVopnladyoBrpoaMJ4PKZDrdOJ05H5RHbr7s9Tid635X3E+ZLU/Q==",
"optional": true
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/cypress-wait-until/-/cypress-wait-until-2.0.0.tgz",
"integrity": "sha512-ulUZyrWBn+OuC8oiQuGKAScDYfpaWnE3dEE/raUo64w4RHQxZrQ/iMIWT4ZjGMMPr3P+BFEALCRnjQeRqzZj6g==",
"optional": true,
"engines": {
"node": ">=18.16.0",
"npm": ">=9.5.1"
}
},
"node_modules/cypress/node_modules/@types/node": {
"version": "14.18.53",
@@ -18862,6 +18877,15 @@
"@types/node": "*"
}
},
"@types/cypress": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/@types/cypress/-/cypress-1.1.3.tgz",
"integrity": "sha512-OXe0Gw8LeCflkG1oPgFpyrYWJmEKqYncBsD/J0r17r0ETx/TnIGDNLwXt/pFYSYuYTpzcq1q3g62M9DrfsBL4g==",
"optional": true,
"requires": {
"cypress": "*"
}
},
"@types/eslint": {
"version": "8.4.1",
"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz",
@@ -20968,9 +20992,9 @@
"peer": true
},
"cypress": {
"version": "12.17.1",
"resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.1.tgz",
"integrity": "sha512-eKfBgO6t8waEyhegL4gxD7tcI6uTCGttu+ZU7y9Hq8BlpMztd7iLeIF4AJFAnbZH1xjX+wwgg4cRKFNSvv3VWQ==",
"version": "12.17.2",
"resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.2.tgz",
"integrity": "sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==",
"optional": true,
"requires": {
"@cypress/request": "^2.88.11",
@@ -21151,9 +21175,9 @@
}
},
"cypress-wait-until": {
"version": "1.7.2",
"resolved": "https://registry.npmjs.org/cypress-wait-until/-/cypress-wait-until-1.7.2.tgz",
"integrity": "sha512-uZ+M8/MqRcpf+FII/UZrU7g1qYZ4aVlHcgyVopnladyoBrpoaMJ4PKZDrdOJ05H5RHbr7s9Tid635X3E+ZLU/Q==",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/cypress-wait-until/-/cypress-wait-until-2.0.0.tgz",
"integrity": "sha512-ulUZyrWBn+OuC8oiQuGKAScDYfpaWnE3dEE/raUo64w4RHQxZrQ/iMIWT4ZjGMMPr3P+BFEALCRnjQeRqzZj6g==",
"optional": true
},
"d": {

5
frontend/package.json
View File

@@ -110,9 +110,10 @@
},
"optionalDependencies": {
"@cypress/schematic": "^2.5.0",
"cypress": "^12.17.1",
"@types/cypress": "^1.1.3",
"cypress": "^12.17.2",
"cypress-fail-on-console-error": "~4.0.3",
"cypress-wait-until": "^1.7.2",
"cypress-wait-until": "^2.0.0",
"mock-socket": "~9.2.1",
"start-server-and-test": "~2.0.0"
},

15
frontend/src/app/services/api.service.ts
View File

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { HttpClient, HttpParams, HttpResponse } from '@angular/common/http';
import { CpfpInfo, OptimizedMempoolStats, AddressInformation, LiquidPegs, ITranslators,
PoolStat, BlockExtended, TransactionStripped, RewardStats, AuditScore, BlockSizesAndWeights, RbfTree, BlockAudit } from '../interfaces/node-api.interface';
import { Observable } from 'rxjs';
import { Observable, of } from 'rxjs';
import { StateService } from './state.service';
import { WebsocketResponse } from '../interfaces/websocket.interface';
import { Outspend, Transaction } from '../interfaces/electrs.interface';
@@ -312,6 +312,19 @@ export class ApiService {
}
getHistoricalPrice$(timestamp: number | undefined): Observable<Conversion> {
if (this.stateService.isAnyTestnet()) {
return of({
prices: [],
exchangeRates: {
USDEUR: 0,
USDGBP: 0,
USDCAD: 0,
USDCHF: 0,
USDAUD: 0,
USDJPY: 0,
}
});
}
return this.httpClient.get<Conversion>(
this.apiBaseUrl + this.apiBasePath + '/api/v1/historical-price' +
(timestamp ? `?timestamp=${timestamp}` : '')

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

@@ -339,6 +339,10 @@ export class StateService {
return this.network === 'liquid' || this.network === 'liquidtestnet';
}
isAnyTestnet(): boolean {
return ['testnet', 'signet', 'liquidtestnet'].includes(this.network);
}
resetChainTip() {
this.latestBlockHeight = -1;
this.chainTip$.next(-1);

2
frontend/src/app/shared/components/global-footer/global-footer.component.scss
View File

@@ -18,7 +18,7 @@ footer .row.main {
}
footer .row.main .branding > p {
margin-bottom: 25px;
margin-bottom: 45px;
}
footer .row.main .branding .btn {

6
frontend/tsconfig.spec.json
View File

@@ -4,8 +4,10 @@
"outDir": "./out-tsc/spec",
"types": [
"jasmine",
"node"
]
"node",
"cypress",
"cypress-wait-until"
]
},
"files": [
"src/test.ts",