Merge branch 'master' into simon/bisq-dashboard

# Conflicts: # frontend/package-lock.json # frontend/package.json
2021-04-12 22:22:50 +04:00
parent 1ae002385d 4bb68d0163
commit fcf7955d63
40 changed files with 10786 additions and 7546 deletions
--- a/backend/src/mempool.interfaces.ts
+++ b/backend/src/mempool.interfaces.ts
@@ -30,6 +30,7 @@ export interface TransactionExtended extends IEsploraApi.Transaction {
  ancestors?: Ancestor[];
  bestDescendant?: BestDescendant | null;
  cpfpChecked?: boolean;
+  deleteAfter?: number;
 }

 interface Ancestor {