Merge branch 'master' into nymkappa/menu

2023-08-29 10:53:09 +02:00
parent 7c11f0a3da 6780ba82d0
commit 9427ba96a2
7 changed files with 68 additions and 34 deletions
--- a/frontend/src/app/interfaces/electrs.interface.ts
+++ b/frontend/src/app/interfaces/electrs.interface.ts
@@ -19,7 +19,7 @@ export interface Transaction {
  ancestors?: Ancestor[];
  bestDescendant?: BestDescendant | null;
  cpfpChecked?: boolean;
-  acceleration?: number;
+  acceleration?: boolean;
  deleteAfter?: number;
  _unblinded?: any;
  _deduced?: boolean;
--- a/frontend/src/app/interfaces/node-api.interface.ts
+++ b/frontend/src/app/interfaces/node-api.interface.ts
@@ -27,7 +27,7 @@ export interface CpfpInfo {
  effectiveFeePerVsize?: number;
  sigops?: number;
  adjustedVsize?: number;
-  acceleration?: number;
+  acceleration?: boolean;
 }

 export interface RbfInfo {