Merge pull request #108 from jamaljsr/update-lnd-loop

Update internal LND and loopd versions

Author: jamaljsr

app/src/__tests__/store/buildSwapStore.spec.ts

@@ -5,7 +5,7 @@ import { waitFor } from '@testing-library/react';
 import Big from 'big.js';
 import { BalanceMode } from 'util/constants';
 import { injectIntoGrpcUnary } from 'util/tests';
-import { lndChannel, loopTerms } from 'util/tests/sampleData';
+import { lndChannel, loopInTerms } from 'util/tests/sampleData';
 import { BuildSwapStore, createStore, Store } from 'store';
 import { Channel } from 'store/models';
 import { SWAP_ABORT_DELAY } from 'store/stores/buildSwapStore';
@@ -105,15 +105,15 @@ describe('BuildSwapStore', () => {
   });
 
   it('should ensure amount is greater than the min terms', async () => {
-    store.setAmount(Big(loopTerms.minSwapAmount - 100));
+    store.setAmount(Big(loopInTerms.minSwapAmount - 100));
     await store.getTerms();
-    expect(+store.amountForSelected).toBe(loopTerms.minSwapAmount);
+    expect(+store.amountForSelected).toBe(loopInTerms.minSwapAmount);
   });
 
   it('should ensure amount is less than the max terms', async () => {
-    store.setAmount(Big(loopTerms.maxSwapAmount + 100));
+    store.setAmount(Big(loopInTerms.maxSwapAmount + 100));
     await store.getTerms();
-    expect(+store.amountForSelected).toBe(loopTerms.maxSwapAmount);
+    expect(+store.amountForSelected).toBe(loopInTerms.maxSwapAmount);
   });
 
   it('should select all channels with the same peer for loop in', () => {
@@ -135,7 +135,7 @@ describe('BuildSwapStore', () => {
     await store.getQuote();
     expect(+store.quote.swapFee).toEqual(83);
     expect(+store.quote.minerFee).toEqual(7387);
-    expect(+store.quote.prepayAmount).toEqual(1337);
+    expect(+store.quote.prepayAmount).toEqual(0);
   });
 
   it('should fetch a loop out quote', async () => {

app/src/api/loop.ts

@@ -33,7 +33,7 @@ class LoopApi extends BaseApi<LoopEvents> {
   /**
    * call the Loop `GetLoopInTerms` RPC and return the response
    */
-  async getLoopInTerms(): Promise<LOOP.TermsResponse.AsObject> {
+  async getLoopInTerms(): Promise<LOOP.InTermsResponse.AsObject> {
     const req = new LOOP.TermsRequest();
     const res = await this._grpc.request(SwapClient.GetLoopInTerms, req, this._meta);
     return res.toObject();
@@ -42,7 +42,7 @@ class LoopApi extends BaseApi<LoopEvents> {
   /**
    * call the Loop `LoopOutTerms` RPC and return the response
    */
-  async getLoopOutTerms(): Promise<LOOP.TermsResponse.AsObject> {
+  async getLoopOutTerms(): Promise<LOOP.OutTermsResponse.AsObject> {
     const req = new LOOP.TermsRequest();
     const res = await this._grpc.request(SwapClient.LoopOutTerms, req, this._meta);
     return res.toObject();
@@ -51,7 +51,7 @@ class LoopApi extends BaseApi<LoopEvents> {
   /**
    * call the Loop `GetLoopInQuote` RPC and return the response
    */
-  async getLoopInQuote(amount: Big): Promise<LOOP.QuoteResponse.AsObject> {
+  async getLoopInQuote(amount: Big): Promise<LOOP.InQuoteResponse.AsObject> {
     const req = new LOOP.QuoteRequest();
     req.setAmt(+amount);
     const res = await this._grpc.request(SwapClient.GetLoopInQuote, req, this._meta);
@@ -61,7 +61,7 @@ class LoopApi extends BaseApi<LoopEvents> {
   /**
    * call the Loop `LoopOutQuote` RPC and return the response
    */
-  async getLoopOutQuote(amount: Big): Promise<LOOP.QuoteResponse.AsObject> {
+  async getLoopOutQuote(amount: Big): Promise<LOOP.OutQuoteResponse.AsObject> {
     const req = new LOOP.QuoteRequest();
     req.setAmt(+amount);
     const res = await this._grpc.request(SwapClient.LoopOutQuote, req, this._meta);

app/src/store/stores/buildSwapStore.ts

@@ -383,17 +383,25 @@ class BuildSwapStore {
     this._store.log.info(`fetching ${direction} quote for ${amount} sats`);
 
     try {
-      const quote =
-        direction === SwapDirection.IN
-          ? await this._store.api.loop.getLoopInQuote(amount)
-          : await this._store.api.loop.getLoopOutQuote(amount);
+      let quote: Quote;
+      if (direction === SwapDirection.IN) {
+        const inQuote = await this._store.api.loop.getLoopInQuote(amount);
+        quote = {
+          swapFee: Big(inQuote.swapFeeSat),
+          minerFee: Big(inQuote.htlcPublishFeeSat),
+          prepayAmount: Big(0),
+        };
+      } else {
+        const outQuote = await this._store.api.loop.getLoopOutQuote(amount);
+        quote = {
+          swapFee: Big(outQuote.swapFeeSat),
+          minerFee: Big(outQuote.htlcSweepFeeSat),
+          prepayAmount: Big(outQuote.prepayAmtSat),
+        };
+      }
 
       runInAction('getQuoteContinuation', () => {
-        this.quote = {
-          swapFee: Big(quote.swapFee),
-          minerFee: Big(quote.minerFee),
-          prepayAmount: Big(quote.prepayAmt),
-        };
+        this.quote = quote;
         this._store.log.info('updated buildSwapStore.quote', toJS(this.quote));
       });
     } catch (error) {

app/src/util/tests/sampleData.ts

@@ -6,7 +6,8 @@ import * as LOOP from 'types/generated/loop_pb';
 //
 
 export const lndGetInfo: LND.GetInfoResponse.AsObject = {
-  version: '0.10.0-beta commit=v0.10.0-beta',
+  version: '0.11.0-beta commit=lightning-terminal-v0.1.0-alpha',
+  commitHash: '9d5c264e7f0fd6751aeb41da497923512ac8fbea',
   identityPubkey: '038b3fc29cfc195c9b190d86ad2d40ce7550a5c6f13941f53c7d7ac5b25c912a6c',
   alias: 'alice',
   color: '#cccccc',
@@ -105,9 +106,12 @@ export const lndChannel: LND.Channel.AsObject = {
   localChanReserveSat: 150000,
   remoteChanReserveSat: 150000,
   staticRemoteKey: true,
+  commitmentType: LND.CommitmentType.STATIC_REMOTE_KEY,
   lifetime: 21802,
   uptime: 21802,
   closeAddress: '',
+  pushAmountSat: 5000000,
+  thawHeight: 0,
 };
 
 export const lndListChannelsMany: LND.ListChannelsResponse.AsObject = {
@@ -149,6 +153,9 @@ export const lndChannelEvent: Required<LND.ChannelEventUpdate.AsObject> = {
     remotePubkey: '030e98fdacf2464bdfb027b866a018d6cdc5108514208988873abea7eff59afd91',
     settledBalance: 12990950,
     timeLockedBalance: 0,
+    openInitiator: 1,
+    closeInitiator: 1,
+    resolutionsList: [],
   },
   activeChannel: {
     fundingTxidBytes: txIdBytes,
@@ -160,6 +167,10 @@ export const lndChannelEvent: Required<LND.ChannelEventUpdate.AsObject> = {
     fundingTxidStr: '',
     outputIndex: outIndex,
   },
+  pendingOpenChannel: {
+    txid: '1f765f45f2a6d33837a203e3fc911915c891e9b86f9c9d91a1931b92efdedf5b',
+    outputIndex: 0,
+  },
 };
 
 export const lndTransaction: LND.Transaction.AsObject = {
@@ -176,6 +187,7 @@ export const lndTransaction: LND.Transaction.AsObject = {
   timeStamp: 1591226124,
   totalFees: 0,
   txHash: '1f765f45f2a6d33837a203e3fc911915c891e9b86f9c9d91a1931b92efdedf5b',
+  label: '',
 };
 
 export const lndGetChanInfo: Required<LND.ChannelEdge.AsObject> = {
@@ -216,6 +228,7 @@ export const loopListSwaps: LOOP.ListSwapsResponse.AsObject = {
     idBytes: '9OsRg4PCsJ2MconOIcJZAM+0VF1GxH7SOjGtKqV86DU=',
     type: (i % 3) as LOOP.SwapStatus.AsObject['type'],
     state: i % 2 ? LOOP.SwapState.SUCCESS : LOOP.SwapState.FAILED,
+    failureReason: (i % 2 === 0 ? 0 : i % 7) as LOOP.SwapStatus.AsObject['failureReason'],
     initiationTime: 1586390353623905000 + i * 100000000000000,
     lastUpdateTime: 1586398369729857000 + i * 200000000000000,
     htlcAddress: 'bcrt1qzu4077erkr78k52yuf2rwkk6ayr6m3wtazdfz2qqmd7taa5vvy9s5d75gd',
@@ -224,28 +237,43 @@ export const loopListSwaps: LOOP.ListSwapsResponse.AsObject = {
     costServer: 66,
     costOnchain: 6812,
     costOffchain: 2,
+    label: `Sample Swap #${i + 1}`,
   })),
 };
 
-export const loopTerms: LOOP.TermsResponse.AsObject = {
+export const loopOutTerms: LOOP.OutTermsResponse.AsObject = {
+  minSwapAmount: 250000,
+  maxSwapAmount: 1000000,
+  minCltvDelta: 20,
+  maxCltvDelta: 60,
+};
+
+export const loopInTerms: LOOP.InTermsResponse.AsObject = {
   minSwapAmount: 250000,
   maxSwapAmount: 1000000,
 };
 
-export const loopQuote: LOOP.QuoteResponse.AsObject = {
+export const loopOutQuote: LOOP.OutQuoteResponse.AsObject = {
   cltvDelta: 50,
-  minerFee: 7387,
-  prepayAmt: 1337,
-  swapFee: 83,
+  htlcSweepFeeSat: 7387,
+  prepayAmtSat: 1337,
+  swapFeeSat: 83,
   swapPaymentDest: 'Au1a9/hEsbxHUOwFC1QwxZq6EnnKYtpAdc74OZK8/syU',
 };
 
+export const loopInQuote: LOOP.InQuoteResponse.AsObject = {
+  cltvDelta: 50,
+  htlcPublishFeeSat: 7387,
+  swapFeeSat: 83,
+};
+
 export const loopSwapResponse: LOOP.SwapResponse.AsObject = {
   htlcAddress: 'bcrt1qkjct8aqxfwyla50mfxdnzlmuphg3zwuz2zmuy99c9sw67xj7tn2sfkflhw',
   htlcAddressNp2wsh: '',
   htlcAddressP2wsh: 'bcrt1qkjct8aqxfwyla50mfxdnzlmuphg3zwuz2zmuy99c9sw67xj7tn2sfkflhw',
   id: '18e17a2f44efc7f344ef6330281765e569315f93d3eaf9b0f959b404836e3480',
   idBytes: 'GOF6L0Tvx/NE72MwKBdl5WkxX5PT6vmw+Vm0BINuNIA=',
+  serverMessage: 'Loop, there it is!',
 };
 
 // collection of sample API responses
@@ -257,10 +285,10 @@ export const sampleApiResponses: Record<string, any> = {
   'lnrpc.Lightning.WalletBalance': lndWalletBalance,
   'lnrpc.Lightning.ListChannels': lndListChannels,
   'looprpc.SwapClient.ListSwaps': loopListSwaps,
-  'looprpc.SwapClient.LoopOutTerms': loopTerms,
-  'looprpc.SwapClient.GetLoopInTerms': loopTerms,
-  'looprpc.SwapClient.LoopOutQuote': loopQuote,
-  'looprpc.SwapClient.GetLoopInQuote': loopQuote,
+  'looprpc.SwapClient.LoopOutTerms': loopOutTerms,
+  'looprpc.SwapClient.GetLoopInTerms': loopInTerms,
+  'looprpc.SwapClient.LoopOutQuote': loopOutQuote,
+  'looprpc.SwapClient.GetLoopInQuote': loopInQuote,
   'looprpc.SwapClient.LoopIn': loopSwapResponse,
   'looprpc.SwapClient.LoopOut': loopSwapResponse,
 };

go.mod

@@ -3,34 +3,25 @@ module github.com/lightninglabs/lightning-terminal
 require (
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
 	github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
-	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.14.3
 	github.com/improbable-eng/grpc-web v0.12.0
 	github.com/jessevdk/go-flags v1.4.0
-	github.com/lightninglabs/faraday v0.2.0-alpha.0.20200708222452-2fe6222047a4
-	github.com/lightninglabs/lndclient v1.0.1-0.20200708220508-33580b267beb
-	github.com/lightninglabs/loop v0.6.5-beta
-	github.com/lightningnetwork/lnd v0.10.3-beta
+	github.com/lightninglabs/faraday v0.2.0-alpha.0.20200811090810-93547d433a66
+	github.com/lightninglabs/lndclient v1.0.1-0.20200629081038-bb0726595df9
+	github.com/lightninglabs/loop v0.8.0-beta
+	github.com/lightningnetwork/lnd v0.11.0-beta
 	github.com/lightningnetwork/lnd/cert v1.0.2
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
 	github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76
 	github.com/prometheus/client_golang v1.5.1 // indirect
 	github.com/rakyll/statik v0.1.7
 	github.com/rs/cors v1.7.0 // indirect
-	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
+	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
 	golang.org/x/sys v0.0.0-20200406155108-e3b113bbe6a4 // indirect
 	google.golang.org/grpc v1.28.0
 	gopkg.in/macaroon-bakery.v2 v2.1.0
 	gopkg.in/macaroon.v2 v2.1.0
 )
 
-// Manually solve the conflict between loop's lndclient version of lnd and what
-// we explicitly need for the unified binary to work.
-replace (
-	github.com/lightninglabs/lndclient => github.com/lightninglabs/lndclient v1.0.1-0.20200708223031-76709c25d859
-	github.com/lightninglabs/loop => github.com/lightninglabs/loop v0.6.5-beta
-	github.com/lightningnetwork/lnd => github.com/lightningnetwork/lnd v0.10.3-beta
-)
-
 go 1.13