Merge pull request #1009 from lightninglabs/limbo-balance

Include limbo balance in Home screen balance.

Author: tanx

src/action/channel.js

@@ -125,7 +125,7 @@ class ChannelAction {
 
   /**
    * List the pending channels by calling the respective grpc api and updating
-   * the pendingChannels array in the global store.
+   * the pendingChannels array and limbo balance in the global store.
    * @return {Promise<undefined>}
    */
   async getPendingChannels() {
@@ -168,6 +168,7 @@ class ChannelAction {
         status: 'waiting-close',
       }));
       this._store.pendingChannels = [].concat(pocs, pccs, pfccs, wccs);
+      this._store.limboBalanceSatoshis = response.totalLimboBalance;
     } catch (err) {
       log.error('Listing pending channels failed', err);
     }

src/computed/wallet.js

@@ -21,8 +21,14 @@ const ComputedWallet = store => {
         balanceSatoshis,
         pendingBalanceSatoshis,
         channelBalanceSatoshis,
+        limboBalanceSatoshis,
       } = store;
-      return balanceSatoshis + pendingBalanceSatoshis + channelBalanceSatoshis;
+      return (
+        balanceSatoshis +
+        pendingBalanceSatoshis +
+        channelBalanceSatoshis +
+        limboBalanceSatoshis
+      );
     },
     get totalBalanceLabel() {
       return toAmountLabel(store.totalBalanceSatoshis, store.settings);

src/store.js

@@ -34,6 +34,7 @@ export class Store {
       unconfirmedBalanceSatoshis: 0,
       pendingBalanceSatoshis: 0,
       channelBalanceSatoshis: 0,
+      limboBalanceSatoshis: 0,
       pubKey: null,
       walletAddress: null,
       displayCopied: false,

test/unit/action/channel.spec.js

@@ -148,13 +148,15 @@ describe('Action Channels Unit Tests', () => {
         pendingClosingChannels: [{ channel: { ...pendingChannel } }],
         pendingForceClosingChannels: [{ channel: { ...pendingChannel } }],
         waitingCloseChannels: [{ channel: { ...pendingChannel } }],
+        totalLimboBalance: 1,
       });
       await channel.getPendingChannels();
       expect(store.pendingChannels.length, 'to equal', 4);
       expect(store.pendingChannels[0], 'to satisfy', {
         remotePubkey: 'some-key',
         fundingTxId: 'FFFF',
       });
+      expect(store.limboBalanceSatoshis, 'to equal', 1);
     });
 
     it('should log error on failure', async () => {

test/unit/computed/wallet.spec.js

@@ -37,9 +37,10 @@ describe('Computed Wallet Unit Tests', () => {
       store.balanceSatoshis = 50000000;
       store.pendingBalanceSatoshis = 50000000;
       store.channelBalanceSatoshis = 10000;
+      store.limboBalanceSatoshis = 100;
       ComputedWallet(store);
-      expect(store.totalBalanceSatoshis, 'to equal', 100010000);
-      expect(store.totalBalanceLabel, 'to match', /6[,.]895[,.]81/);
+      expect(store.totalBalanceSatoshis, 'to equal', 100010100);
+      expect(store.totalBalanceLabel, 'to match', /6[,.]895[,.]82/);
       expect(store.unitFiatLabel, 'to equal', '$');
       expect(store.unitLabel, 'to equal', null);
       expect(store.channelPercentageLabel, 'to equal', '50% on Lightning');
@@ -51,10 +52,11 @@ describe('Computed Wallet Unit Tests', () => {
       store.balanceSatoshis = 50000001;
       store.pendingBalanceSatoshis = 50000000;
       store.channelBalanceSatoshis = 10000;
+      store.limboBalanceSatoshis = 100;
       store.settings.unit = 'bit';
       ComputedWallet(store);
-      expect(store.totalBalanceSatoshis, 'to equal', 100010001);
-      expect(store.totalBalanceLabel, 'to match', /1[,.]000[,.]100[,.]01/);
+      expect(store.totalBalanceSatoshis, 'to equal', 100010101);
+      expect(store.totalBalanceLabel, 'to match', /1[,.]000[,.]101[,.]01/);
       expect(store.unitFiatLabel, 'to equal', 'bits');
       expect(store.unitLabel, 'to equal', 'bits');
     });