mirrors/Ride-The-Lightning-RTL
1
0
Fork 0
mirror of https://github.com/Ride-The-Lightning/RTL.git synced 2025-03-12 18:48:09 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr/1039' into Release-0.13.0

Browse source
This commit is contained in:
ShahanaFarooqui 2022-08-13 19:53:12 -07:00
commit 07f8d326d8
8 changed files with 58 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/controllers/lnd/channels.ts
View file

@ -224,6 +224,9 @@ export const postChanPolicy = (req, res, next) => {
base_fee_msat: req.body.baseFeeMsat,
fee_rate: parseFloat((req.body.feeRate / 1000000).toString()),
time_lock_delta: parseInt(req.body.timeLockDelta),
max_htlc_msat: req.body.max_htlc_msat,
min_htlc_msat: req.body.min_htlc_msat,
min_htlc_msat_specified: true,
chan_point: { funding_txid_str: txid_str, output_index: parseInt(output_idx) }
});
}

10
src/app/lnd/graph/lookups/channel-lookup/channel-lookup.component.html
View file

@ -44,6 +44,11 @@
<span class="foreground-secondary-text">{{lookupResult.node1_policy?.min_htlc}}</span>
</div>
<mat-divider [inset]="true" class="my-1"></mat-divider>
<div fxLayout="column" fxFlex="10">
<h4 class="font-bold-500">Max HTLC</h4>
<span class="foreground-secondary-text">{{lookupResult.node1_policy?.max_htlc_msat}}</span>
</div>
<mat-divider [inset]="true" class="my-1"></mat-divider>
<div fxLayout="column" fxFlex="10">
<h4 class="font-bold-500">Fee Base Msat</h4>
<span class="foreground-secondary-text">{{lookupResult.node1_policy?.fee_base_msat}}</span>
@ -80,6 +85,11 @@
<span class="foreground-secondary-text">{{lookupResult.node2_policy?.min_htlc}}</span>
</div>
<mat-divider [inset]="true" class="my-1"></mat-divider>
<div fxLayout="column" fxFlex="10">
<h4 class="font-bold-500">Max HTLC</h4>
<span class="foreground-secondary-text">{{lookupResult.node2_policy?.max_htlc_msat}}</span>
</div>
<mat-divider [inset]="true" class="my-1"></mat-divider>
<div fxLayout="column" fxFlex="10">
<h4 class="font-bold-500">Fee Base Msat</h4>
<span class="foreground-secondary-text">{{lookupResult.node2_policy?.fee_base_msat}}</span>

18
src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts
View file

@ -199,7 +199,7 @@ export class ChannelOpenTableComponent implements OnInit, AfterViewInit, OnDestr
}
});
} else {
this.myChanPolicy = { fee_base_msat: 0, fee_rate_milli_msat: 0, time_lock_delta: 0 };
this.myChanPolicy = { fee_base_msat: 0, fee_rate_milli_msat: 0, time_lock_delta: 0, min_htlc_msat: 0, max_htlc_msat: 0 };
this.store.dispatch(channelLookup({ payload: { uiMessage: UI_MESSAGES.GET_CHAN_POLICY, channelID: channelToUpdate.chan_id.toString() } }));
this.lndEffects.setLookup.pipe(take(1)).subscribe((resLookup) => {
if (resLookup.node1_pub === this.information.identity_pubkey) {
@ -223,10 +223,13 @@ export class ChannelOpenTableComponent implements OnInit, AfterViewInit, OnDestr
yesBtnText: 'Update Channel',
message: confirmationMsg,
flgShowInput: true,
hasAdvanced: true,
getInputs: [
{ placeholder: 'Base Fee (mSat)', inputType: DataTypeEnum.NUMBER.toLowerCase(), inputValue: (this.myChanPolicy.fee_base_msat === '') ? 0 : this.myChanPolicy.fee_base_msat, width: 32 },
{ placeholder: 'Fee Rate (mili mSat)', inputType: DataTypeEnum.NUMBER.toLowerCase(), inputValue: this.myChanPolicy.fee_rate_milli_msat, min: 1, width: 32, hintFunction: this.percentHintFunction },
{ placeholder: 'Time Lock Delta', inputType: DataTypeEnum.NUMBER.toLowerCase(), inputValue: this.myChanPolicy.time_lock_delta, width: 32 }
{ placeholder: 'Time Lock Delta', inputType: DataTypeEnum.NUMBER.toLowerCase(), inputValue: this.myChanPolicy.time_lock_delta, width: 32 },
{ placeholder: 'Minimum HTLC (mSat)', inputType: DataTypeEnum.NUMBER.toLowerCase(), inputValue: (this.myChanPolicy.min_htlc === '') ? 0 : this.myChanPolicy.min_htlc, width: 32, advancedField: true },
{ placeholder: 'Maximum HTLC (mSat)', inputType: DataTypeEnum.NUMBER.toLowerCase(), inputValue: (this.myChanPolicy.max_htlc_msat === '') ? 0 : this.myChanPolicy.max_htlc_msat, width: 32, advancedField: true }
]
}
}
@ -240,7 +243,16 @@ export class ChannelOpenTableComponent implements OnInit, AfterViewInit, OnDestr
const base_fee = confirmRes[0].inputValue;
const fee_rate = confirmRes[1].inputValue;
const time_lock_delta = confirmRes[2].inputValue;
this.store.dispatch(updateChannel({ payload: { baseFeeMsat: base_fee, feeRate: fee_rate, timeLockDelta: time_lock_delta, chanPoint: channelToUpdate.channel_point } }));
const min_htlc = confirmRes[3].inputValue;
const max_htlc_msat = confirmRes[4].inputValue;
this.store.dispatch(updateChannel({ payload: {
baseFeeMsat: base_fee,
feeRate: fee_rate,
timeLockDelta: time_lock_delta,
minHtlcMsat: min_htlc,
maxHtlcMsat: max_htlc_msat,
chanPoint: channelToUpdate.channel_point
} }));
}
});
}

7
src/app/lnd/store/lnd.effects.ts
View file

@ -302,7 +302,12 @@ export class LNDEffects implements OnDestroy {
mergeMap((action: { type: string, payload: any }) => {
this.store.dispatch(openSpinner({ payload: UI_MESSAGES.UPDATE_CHAN_POLICY }));
return this.httpClient.post(this.CHILD_API_URL + environment.CHANNELS_API + '/chanPolicy',
{ baseFeeMsat: action.payload.baseFeeMsat, feeRate: action.payload.feeRate, timeLockDelta: action.payload.timeLockDelta, chanPoint: action.payload.chanPoint }
{ baseFeeMsat: action.payload.baseFeeMsat,
feeRate: action.payload.feeRate,
timeLockDelta: action.payload.timeLockDelta,
max_htlc_msat: action.payload.maxHtlcMsat,
min_htlc_msat: action.payload.minHtlcMsat,
chanPoint: action.payload.chanPoint }
).pipe(
map((postRes: any) => {
this.logger.info(postRes);

19
src/app/shared/components/data-modal/confirmation-message/confirmation-message.component.html
View file

@ -43,16 +43,21 @@
</div>
<div *ngIf="flgShowInput" fxLayout="column" class="bordered-box my-2 p-2">
<p *ngIf="data.titleMessage" fxLayoutAlign="start center" class="pb-1">{{data.titleMessage}}</p>
<div fxLayoutAlign="space-between center">
<mat-form-field *ngFor="let getInput of getInputs; index as i" [fxFlex]="getInput.width">
<input *ngIf="i === 0" autoFocus matInput [placeholder]="getInput.placeholder" name="input{{i}}" [min]="getInput.min" [step]="getInput.step" [type]="getInput.inputType | lowercase" [(ngModel)]="getInput.inputValue" [tabindex]="i+1" required>
<input *ngIf="i !== 0" matInput [placeholder]="getInput.placeholder" name="input{{i}}" [min]="getInput.min" [step]="getInput.step" [type]="getInput.inputType | lowercase" [(ngModel)]="getInput.inputValue" [tabindex]="i+1" required>
<mat-error *ngIf="!getInput.inputValue">{{getInput.placeholder}} is required.</mat-error>
<mat-hint>{{getInput.hintFunction ? getInput.hintFunction(getInput.inputValue) : getInput.hintText}}</mat-hint>
</mat-form-field>
<div [fxLayout]="showAdvanced ? 'column' : 'row'" [fxLayoutAlign]="showAdvanced ? 'start' : 'space-between center'">
<ng-container *ngFor="let getInput of getInputs; index as i">
<mat-form-field *ngIf="!getInput.advancedField || showAdvanced" [fxFlex]="getInput.width">
<input matInput [autoFocus]="i === 0" [placeholder]="getInput.placeholder" name="input{{i}}" [min]="getInput.min" [step]="getInput.step" [type]="getInput.inputType | lowercase" [(ngModel)]="getInput.inputValue" [tabindex]="i+1" required>
<mat-error *ngIf="!getInput.inputValue">{{getInput.placeholder}} is required.</mat-error>
<mat-hint>{{getInput.hintFunction ? getInput.hintFunction(getInput.inputValue) : getInput.hintText}}</mat-hint>
</mat-form-field>
</ng-container>
</div>
</div>
<div fxLayout="row" fxLayoutAlign="end center">
<button *ngIf="hasAdvanced" mat-button color="primary" type="button" class="mr-1" (click)="onShowAdvanced()" tabindex="1" >
<p *ngIf="!showAdvanced; else hideAdvancedText">Show Advanced</p>
<ng-template #hideAdvancedText><p>Hide Advanced</p></ng-template>
</button>
<button mat-button color="primary" type="reset" class="mr-1" (click)="onClose(false)" tabindex="2">{{noBtnText}}</button>
<button autoFocus *ngIf="flgShowInput" mat-button color="primary" type="submit" tabindex="3" (click)="onClose(getInputs)" default>{{yesBtnText}}</button>
<button autoFocus *ngIf="!flgShowInput" mat-button color="primary" type="submit" tabindex="4" (click)="onClose(true)" default>{{yesBtnText}}</button>

10
src/app/shared/components/data-modal/confirmation-message/confirmation-message.component.ts
View file

@ -25,9 +25,12 @@ export class ConfirmationMessageComponent implements OnInit {
public yesBtnText = 'Yes';
public messageObjs = [];
public flgShowInput = false;
public hasAdvanced = false;
public alertTypeEnum = AlertTypeEnum;
public dataTypeEnum = DataTypeEnum;
public getInputs: Array<InputData> = [{ placeholder: '', inputType: 'text', inputValue: '', hintText: '', hintFunction: null }];
public getInputs: Array<InputData> = [{ placeholder: '', inputType: 'text', inputValue: '', hintText: '', hintFunction: null, advancedField: false }];
private showAdvanced = false;
constructor(
public dialogRef: MatDialogRef<ConfirmationMessageComponent>, @Inject(MAT_DIALOG_DATA) public data: ConfirmationData, private logger: LoggerService,
@ -41,6 +44,7 @@ export class ConfirmationMessageComponent implements OnInit {
this.getInputs = this.data.getInputs;
this.noBtnText = (this.data.noBtnText) ? this.data.noBtnText : 'No';
this.yesBtnText = (this.data.yesBtnText) ? this.data.yesBtnText : 'Yes';
this.hasAdvanced = (this.data.hasAdvanced) ? this.data.hasAdvanced : false;
this.messageObjs = this.data.message;
if (this.data.type === AlertTypeEnum.ERROR) {
if (!this.data.message && !this.data.titleMessage && this.messageObjs.length <= 0) {
@ -48,6 +52,10 @@ export class ConfirmationMessageComponent implements OnInit {
}
}
}
onShowAdvanced() {
this.showAdvanced = !this.showAdvanced;
}
onClose(dialogRes: any): boolean | void {
if (dialogRes && this.getInputs && this.getInputs.some((input) => typeof input.inputValue === 'undefined')) {

2
src/app/shared/models/alertData.ts
View file

@ -30,6 +30,7 @@ export interface InputData {
width?: number;
hintText?: string;
hintFunction?: Function;
advancedField?: boolean;
}
export interface OnChainLabelUTXO {
@ -205,6 +206,7 @@ export interface ConfirmationData {
noBtnText?: string;
yesBtnText?: string;
flgShowInput?: boolean;
hasAdvanced?: boolean;
getInputs?: Array<InputData>;
component?: any;
}

1
src/app/shared/models/lndModels.ts
View file

@ -168,6 +168,7 @@ export interface LightningNode {
export interface RoutingPolicy {
time_lock_delta?: number;
min_htlc?: string;
max_htlc_msat?: string;
fee_base_msat?: string;
fee_rate_milli_msat?: string;
disabled?: boolean;