Merge branch 'master' into natsoni/tx-input-overflow

frontend/src/app/interfaces/electrs.interface.ts

@@ -1,5 +1,5 @@
-import { Price } from '../services/price.service';
-import { IChannel } from './node-api.interface';
+import { Price } from '@app/services/price.service';
+import { IChannel } from '@interfaces/node-api.interface';
 
 export interface Transaction {
   txid: string;
@@ -166,6 +166,7 @@ export interface AddressTxSummary {
   height: number;
   time: number;
   price?: number;
+  tx_position?: number;
 }
 
 export interface ChainStats {
@@ -245,4 +246,4 @@ export interface Utxo {
   vout: number;
   value: number;
   status: Status;
-}
+}

frontend/src/app/interfaces/node-api.interface.ts

@@ -1,4 +1,4 @@
-import { Block, Transaction } from "./electrs.interface";
+import { AddressTxSummary, Block, ChainStats, Transaction } from "./electrs.interface";
 
 export interface OptimizedMempoolStats {
   added: number;
@@ -143,6 +143,8 @@ export interface SinglePoolStats {
   rank: number;
   share: number;
   lastEstimatedHashrate: number;
+  lastEstimatedHashrate3d: number;
+  lastEstimatedHashrate1w: number;
   emptyBlockRatio: string;
   logo: string;
   slug: string;
@@ -152,6 +154,8 @@ export interface SinglePoolStats {
 export interface PoolsStats {
   blockCount: number;
   lastEstimatedHashrate: number;
+  lastEstimatedHashrate3d: number;
+  lastEstimatedHashrate1w: number;
   pools: SinglePoolStats[];
 }
 
@@ -471,3 +475,9 @@ export interface TxResult {
   };
   error?: string;
 }
+export interface WalletAddress {
+  address: string;
+  active: boolean;
+  stats: ChainStats;
+  transactions: AddressTxSummary[];
+}

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 { Acceleration, BlockExtended, DifficultyAdjustment, RbfTree, TransactionStripped } from './node-api.interface';
+import { ILoadingIndicators } from '@app/services/state.service';
+import { Transaction } from '@interfaces/electrs.interface';
+import { Acceleration, BlockExtended, DifficultyAdjustment, RbfTree, TransactionStripped } from '@interfaces/node-api.interface';
 
 export interface WebsocketResponse {
   backend?: 'esplora' | 'electrum' | 'none';
@@ -36,6 +36,7 @@ export interface WebsocketResponse {
   'track-rbf'?: string;
   'track-rbf-summary'?: boolean;
   'track-accelerations'?: boolean;
+  'track-wallet'?: string;
   'watch-mempool'?: boolean;
   'refresh-blocks'?: boolean;
 }
@@ -143,4 +144,9 @@ export interface HealthCheckHost {
   link?: string;
   statusPage?: SafeResourceUrl;
   flag?: string;
-}
+  hashes?: {
+    frontend?: string;
+    backend?: string;
+    electrs?: string;
+  }
+}