Merge branch 'master' into simon/bisq-dashboard

# Conflicts: # frontend/package-lock.json # frontend/package.json
2021-04-12 22:22:50 +04:00
parent 8e57aac934 0bf49c390e
commit 8b7850e6e1
40 changed files with 10786 additions and 7546 deletions
--- a/frontend/src/app/interfaces/electrs.interface.ts
+++ b/frontend/src/app/interfaces/electrs.interface.ts
@@ -11,7 +11,24 @@ export interface Transaction {

  // Custom properties
  firstSeen?: number;
+  feePerVsize?: number;
  effectiveFeePerVsize?: number;
+  ancestors?: Ancestor[];
+  bestDescendant?: BestDescendant | null;
+  cpfpChecked?: boolean;
+  deleteAfter?: number;
+}
+
+interface Ancestor {
+  txid: string;
+  weight: number;
+  fee: number;
+}
+
+interface BestDescendant {
+  txid: string;
+  weight: number;
+  fee: number;
 }

 export interface Recent {