From cb722e160881e68c81dd4c693b17eb60356da5d4 Mon Sep 17 00:00:00 2001
From: Mike Fluff <mf@mikefluff.com>
Date: Wed, 6 Mar 2019 11:34:17 +0700
Subject: [PATCH] Fix after merge

---
 class/User.js      | 1 +
 controllers/api.js | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/class/User.js b/class/User.js
index 5720ff4..5f6f741 100644
--- a/class/User.js
+++ b/class/User.js
@@ -312,6 +312,7 @@ export class User {
       delete invoice.payment_route;
       delete invoice.pay_req;
       delete invoice.decoded;
+      result.push(invoice);	    
     }
     return result;
   }
diff --git a/controllers/api.js b/controllers/api.js
index eca3346..fe95d6f 100644
--- a/controllers/api.js
+++ b/controllers/api.js
@@ -18,8 +18,7 @@ let lightning = require('../lightning');
 let identity_pubkey = false;
 // ###################### SMOKE TESTS ########################
 
-bitcoinclient.request('getinfo', false, function(err, info) {
- console.log(err)	
+bitcoinclient.request('getblockchaininfo', false, function(err, info) {
   if (info && info.result && info.result.blocks) {
     if (info.result.blocks < 550000) {
       console.error('bitcoind is not caught up');
@@ -252,7 +251,7 @@ router.get('/balance', async function(req, res) {
   }
 
   if (!(await u.getAddress())) await u.generateAddress(); // onchain address needed further
-  u.accountForPosibleTxids();
+  await u.accountForPosibleTxids();
   let balance = await u.getBalance();
   if (balance < 0) balance = 0;
   res.send({ BTC: { AvailableBalance: balance } });
@@ -280,7 +279,7 @@ router.get('/gettxs', async function(req, res) {
 
   if (!(await u.getAddress())) await u.generateAddress(); // onchain addr needed further
   try {
-    u.accountForPosibleTxids();
+  await u.accountForPosibleTxids();
     let txs = await u.getTxs();
     res.send(txs);
   } catch (Err) {
@@ -317,7 +316,7 @@ router.get('/getpending', async function(req, res) {
   }
 
   if (!(await u.getAddress())) await u.generateAddress(); // onchain address needed further
-  u.accountForPosibleTxids();
+  await u.accountForPosibleTxids();
   let txs = await u.getPendingTxs();
   res.send(txs);
 });