loop: pass channel ids to Loop Out RPC request

Author: jamaljsr

app/src/api/loop.ts

@@ -80,14 +80,19 @@ class LoopApi {
   /**
    * call the Loop `LoopOut` RPC and return the response
    */
-  async loopOut(amount: number, quote: Quote): Promise<LOOP.SwapResponse.AsObject> {
+  async loopOut(
+    amount: number,
+    quote: Quote,
+    chanIds: number[],
+  ): Promise<LOOP.SwapResponse.AsObject> {
     const req = new LOOP.LoopOutRequest();
     req.setAmt(amount);
     req.setMaxSwapFee(quote.swapFee);
     req.setMaxMinerFee(quote.minerFee);
     req.setMaxPrepayAmt(quote.prepayAmount);
     req.setMaxSwapRoutingFee(this._calcRoutingFee(quote.swapFee));
     req.setMaxPrepayRoutingFee(this._calcRoutingFee(quote.prepayAmount));
+    req.setOutgoingChanSetList(chanIds);
 
     if (IS_PROD) {
       // in prod env, push the deadline out for 30 mins for lower fees

app/src/store/stores/buildSwapStore.ts

@@ -296,10 +296,11 @@ class BuildSwapStore {
     );
     this.processingTimeout = setTimeout(async () => {
       try {
+        const chanIds = this.selectedChanIds.map(v => parseInt(v));
         const res =
           direction === SwapDirection.IN
             ? await this._store.api.loop.loopIn(amount, quote)
-            : await this._store.api.loop.loopOut(amount, quote);
+            : await this._store.api.loop.loopOut(amount, quote, chanIds);
         this._store.log.info('completed loop', toJS(res));
         runInAction('requestSwapContinuation', () => {
           // hide the swap UI after it is complete

app/src/types/generated/loop_pb.d.ts

@@ -29,6 +29,11 @@ export class LoopOutRequest extends jspb.Message {
   getLoopOutChannel(): number;
   setLoopOutChannel(value: number): void;
 
+  clearOutgoingChanSetList(): void;
+  getOutgoingChanSetList(): Array<number>;
+  setOutgoingChanSetList(value: Array<number>): void;
+  addOutgoingChanSet(value: number, index?: number): number;
+
   getSweepConfTarget(): number;
   setSweepConfTarget(value: number): void;
 
@@ -55,6 +60,7 @@ export namespace LoopOutRequest {
     maxPrepayAmt: number,
     maxMinerFee: number,
     loopOutChannel: number,
+    outgoingChanSetList: Array<number>,
     sweepConfTarget: number,
     swapPublicationDeadline: number,
   }
@@ -78,6 +84,9 @@ export class LoopInRequest extends jspb.Message {
   getExternalHtlc(): boolean;
   setExternalHtlc(value: boolean): void;
 
+  getHtlcConfTarget(): number;
+  setHtlcConfTarget(value: number): void;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): LoopInRequest.AsObject;
   static toObject(includeInstance: boolean, msg: LoopInRequest): LoopInRequest.AsObject;
@@ -95,6 +104,7 @@ export namespace LoopInRequest {
     maxMinerFee: number,
     lastHop: Uint8Array | string,
     externalHtlc: boolean,
+    htlcConfTarget: number,
   }
 }
 
@@ -110,6 +120,12 @@ export class SwapResponse extends jspb.Message {
   getHtlcAddress(): string;
   setHtlcAddress(value: string): void;
 
+  getHtlcAddressNp2wsh(): string;
+  setHtlcAddressNp2wsh(value: string): void;
+
+  getHtlcAddressP2wsh(): string;
+  setHtlcAddressP2wsh(value: string): void;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): SwapResponse.AsObject;
   static toObject(includeInstance: boolean, msg: SwapResponse): SwapResponse.AsObject;
@@ -125,6 +141,8 @@ export namespace SwapResponse {
     id: string,
     idBytes: Uint8Array | string,
     htlcAddress: string,
+    htlcAddressNp2wsh: string,
+    htlcAddressP2wsh: string,
   }
 }
 
@@ -171,6 +189,12 @@ export class SwapStatus extends jspb.Message {
   getHtlcAddress(): string;
   setHtlcAddress(value: string): void;
 
+  getHtlcAddressP2wsh(): string;
+  setHtlcAddressP2wsh(value: string): void;
+
+  getHtlcAddressNp2wsh(): string;
+  setHtlcAddressNp2wsh(value: string): void;
+
   getCostServer(): number;
   setCostServer(value: number): void;
 
@@ -200,6 +224,8 @@ export namespace SwapStatus {
     initiationTime: number,
     lastUpdateTime: number,
     htlcAddress: string,
+    htlcAddressP2wsh: string,
+    htlcAddressNp2wsh: string,
     costServer: number,
     costOnchain: number,
     costOffchain: number,