machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into nymkappa/mega-branch

Browse Source
This commit is contained in:
nymkappa
2024-02-08 13:37:17 +01:00
parent 0ab1183048 dcccc3c8a2
commit 2dc2a22edb
52 changed files with 652 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/app/shared/components/fee-rate/fee-rate.component.html
View File

@@ -1,4 +1,10 @@
<ng-container *ngIf="rateUnits$ | async as units">
<ng-container *ngIf="units !== 'wu'">{{ fee / (weight / 4) | feeRounding:rounding }} <span *ngIf="showUnit" [class]="unitClass" [style]="unitStyle" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></ng-container>
<ng-container *ngIf="units === 'wu'">{{ fee / weight | feeRounding:rounding }} <span *ngIf="showUnit" [class]="unitClass" [style]="unitStyle" i18n="shared.sat-weight-units|sat/WU">sat/WU</span></ng-container>
<ng-container *ngIf="fee !== undefined; else noFee">
<ng-container *ngIf="units !== 'wu'">{{ fee / (weight / 4) | feeRounding:rounding }} <span *ngIf="showUnit" [class]="unitClass" [style]="unitStyle" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></ng-container>
<ng-container *ngIf="units === 'wu'">{{ fee / weight | feeRounding:rounding }} <span *ngIf="showUnit" [class]="unitClass" [style]="unitStyle" i18n="shared.sat-weight-units|sat/WU">sat/WU</span></ng-container>
</ng-container>
<ng-template #noFee>
<ng-container *ngIf="units !== 'wu'">- <span *ngIf="showUnit" [class]="unitClass" [style]="unitStyle" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></ng-container>
<ng-container *ngIf="units === 'wu'">- <span *ngIf="showUnit" [class]="unitClass" [style]="unitStyle" i18n="shared.sat-weight-units|sat/WU">sat/WU</span></ng-container>
</ng-template>
</ng-container>

2
frontend/src/app/shared/components/fee-rate/fee-rate.component.ts
View File

@@ -8,7 +8,7 @@ import { StateService } from '../../../services/state.service';
styleUrls: ['./fee-rate.component.scss']
})
export class FeeRateComponent implements OnInit {
@Input() fee: number;
@Input() fee: number | undefined;
@Input() weight: number = 4;
@Input() rounding: string = null;
@Input() showUnit: boolean = true;

12
frontend/src/app/shared/regex.utils.ts
View File

@@ -77,11 +77,15 @@ const ADDRESS_CHARS: {
+ `)`,
},
liquid: {
base58: `[GHPQ]` // G|H is P2PKH, P|Q is P2SH
+ BASE58_CHARS
+ `{33}`, // All min-max lengths are 34
base58: `[GHPQ]` // PQ is P2PKH, GH is P2SH
+ BASE58_CHARS
+ `{33}` // All min-max lengths are 34
+ `|`
+ `[V][TJ]` // Confidential P2PKH or P2SH starts with VT or VJ
+ BASE58_CHARS
+ `{78}`,
bech32: `(?:`
+ `(?:` // bech32 liquid starts with ex1 or lq1
+ `(?:` // bech32 liquid starts with ex1 (unconfidential) or lq1 (confidential)
+ `ex1`
+ `|`
+ `lq1`