Difficulty adjustment refactor

fixes #1157

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

@@ -26,12 +26,15 @@ export interface CpfpInfo {
 }
 
 export interface DifficultyAdjustment {
+  progressPercent: number;
   difficultyChange: number;
   estimatedRetargetDate: number;
-  previousRetarget: number;
-  progressPercent: number;
   remainingBlocks: number;
   remainingTime: number;
+  previousRetarget: number;
+  nextRetargetHeight: number;
+  timeAvg: number;
+  timeOffset: number;
 }
 
 export interface AddressInformation {
@@ -111,4 +114,3 @@ export interface BlockExtension {
 export interface BlockExtended extends Block {
   extras?: BlockExtension;
 }
-

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

@@ -1,6 +1,6 @@
 import { ILoadingIndicators } from '../services/state.service';
 import { Transaction } from './electrs.interface';
-import { BlockExtended } from './node-api.interface';
+import { BlockExtended, DifficultyAdjustment } from './node-api.interface';
 
 export interface WebsocketResponse {
   block?: BlockExtended;
@@ -10,7 +10,6 @@ export interface WebsocketResponse {
   historicalDate?: string;
   mempoolInfo?: MempoolInfo;
   vBytesPerSecond?: number;
-  lastDifficultyAdjustment?: number;
   previousRetarget?: number;
   action?: string;
   data?: string[];
@@ -21,6 +20,7 @@ export interface WebsocketResponse {
   transactions?: TransactionStripped[];
   loadingIndicators?: ILoadingIndicators;
   backendInfo?: IBackendInfo;
+  da?: DifficultyAdjustment;
   'track-tx'?: string;
   'track-address'?: string;
   'track-asset'?: string;