Merge pull request #809 from lightninglabs/grpc-long-number

Grpc long number

Author: valentinewallace

public/grpc-client.js

@@ -63,7 +63,7 @@ module.exports.init = async function({
     protoPath = path.join(__dirname, '..', 'assets', 'rpc.proto');
     const options = {
       keepCase: false,
-      longs: String,
+      longs: Number,
       enums: String,
       defaults: true,
       oneofs: true,

src/action/channel.js

@@ -3,7 +3,7 @@
  * call the corresponding GRPC apis for channel management.
  */
 
-import { toSatoshis, parseSat } from '../helper';
+import { toSatoshis } from '../helper';
 import * as log from './log';
 
 class ChannelAction {
@@ -102,9 +102,9 @@ class ChannelAction {
       this._store.channels = channels.map(channel => ({
         remotePubkey: channel.remotePubkey,
         id: channel.chanId,
-        capacity: parseSat(channel.capacity),
-        localBalance: parseSat(channel.localBalance),
-        remoteBalance: parseSat(channel.remoteBalance),
+        capacity: channel.capacity,
+        localBalance: channel.localBalance,
+        remoteBalance: channel.remoteBalance,
         channelPoint: channel.channelPoint,
         fundingTxId: this._parseChannelPoint(channel.channelPoint)
           .fundingTxidStr,
@@ -127,9 +127,9 @@ class ChannelAction {
       const response = await this._grpc.sendCommand('pendingChannels');
       const mapPendingAttributes = channel => ({
         remotePubkey: channel.remoteNodePub,
-        capacity: parseSat(channel.capacity),
-        localBalance: parseSat(channel.localBalance),
-        remoteBalance: parseSat(channel.remoteBalance),
+        capacity: channel.capacity,
+        localBalance: channel.localBalance,
+        remoteBalance: channel.remoteBalance,
         channelPoint: channel.channelPoint,
         fundingTxId: this._parseChannelPoint(channel.channelPoint)
           .fundingTxidStr,
@@ -177,13 +177,12 @@ class ChannelAction {
       const { channels } = await this._grpc.sendCommand('closedChannels');
       this._store.closedChannels = channels.map(channel => ({
         remotePubkey: channel.remotePubkey,
-        capacity: parseSat(channel.capacity),
+        capacity: channel.capacity,
         channelPoint: channel.channelPoint,
         fundingTxId: this._parseChannelPoint(channel.channelPoint)
           .fundingTxidStr,
-        localBalance: parseSat(channel.settledBalance),
-        remoteBalance:
-          parseSat(channel.capacity) - parseSat(channel.settledBalance),
+        localBalance: channel.settledBalance,
+        remoteBalance: channel.capacity - channel.settledBalance,
         closingTxId: channel.closingTxHash,
         status: 'closed',
       }));

src/action/payment.js

@@ -4,14 +4,7 @@
  */
 
 import { PREFIX_URI, PAYMENT_TIMEOUT } from '../config';
-import {
-  toSatoshis,
-  toAmount,
-  parseSat,
-  isLnUri,
-  isAddress,
-  nap,
-} from '../helper';
+import { toSatoshis, toAmount, isLnUri, isAddress, nap } from '../helper';
 import * as log from './log';
 
 class PaymentAction {
@@ -108,11 +101,11 @@ class PaymentAction {
       const request = await this._grpc.sendCommand('decodePayReq', {
         payReq: invoice.replace(PREFIX_URI, ''),
       });
-      payment.amount = toAmount(parseSat(request.numSatoshis), settings);
+      payment.amount = toAmount(request.numSatoshis, settings);
       payment.note = request.description;
       await this.estimateLightningFee({
         destination: request.destination,
-        satAmt: parseSat(request.numSatoshis),
+        satAmt: request.numSatoshis,
       });
       return true;
     } catch (err) {
@@ -136,7 +129,7 @@ class PaymentAction {
         amt: satAmt,
         numRoutes: 1,
       });
-      payment.fee = toAmount(parseSat(routes[0].totalFees), settings);
+      payment.fee = toAmount(routes[0].totalFees, settings);
     } catch (err) {
       log.error(`Estimating lightning fee failed!`, err);
     }

src/action/transaction.js

@@ -4,7 +4,7 @@
  */
 
 import * as log from './log';
-import { parseDate, parseSat, toHex } from '../helper';
+import { parseDate, toHex } from '../helper';
 
 class TransactionAction {
   constructor(store, grpc, nav, notification) {
@@ -60,8 +60,8 @@ class TransactionAction {
       this._store.transactions = transactions.map(transaction => ({
         id: transaction.txHash,
         type: 'bitcoin',
-        amount: parseSat(transaction.amount),
-        fee: parseSat(transaction.totalFees),
+        amount: transaction.amount,
+        fee: transaction.totalFees,
         confirmations: transaction.numConfirmations,
         status: transaction.numConfirmations < 1 ? 'unconfirmed' : 'confirmed',
         date: parseDate(transaction.timeStamp),
@@ -82,7 +82,7 @@ class TransactionAction {
       this._store.invoices = invoices.map(invoice => ({
         id: toHex(invoice.rHash),
         type: 'lightning',
-        amount: parseSat(invoice.value),
+        amount: invoice.value,
         status: invoice.settled ? 'complete' : 'in-progress',
         date: parseDate(invoice.creationDate),
         memo: invoice.memo,
@@ -103,8 +103,8 @@ class TransactionAction {
       this._store.payments = payments.map(payment => ({
         id: payment.paymentHash,
         type: 'lightning',
-        amount: -1 * parseSat(payment.value),
-        fee: parseSat(payment.fee),
+        amount: -1 * payment.value,
+        fee: payment.fee,
         status: 'complete',
         date: parseDate(payment.creationDate),
       }));

src/action/wallet.js

@@ -3,7 +3,7 @@
  * call the corresponding GRPC apis for updating wallet balances.
  */
 
-import { toBuffer, parseSat, checkHttpStatus, nap, poll } from '../helper';
+import { toBuffer, checkHttpStatus, nap, poll } from '../helper';
 import {
   MIN_PASSWORD_LENGTH,
   NOTIFICATION_DELAY,
@@ -394,9 +394,9 @@ class WalletAction {
   async getBalance() {
     try {
       const r = await this._grpc.sendCommand('WalletBalance');
-      this._store.balanceSatoshis = parseSat(r.totalBalance);
-      this._store.confirmedBalanceSatoshis = parseSat(r.confirmedBalance);
-      this._store.unconfirmedBalanceSatoshis = parseSat(r.unconfirmedBalance);
+      this._store.balanceSatoshis = r.totalBalance;
+      this._store.confirmedBalanceSatoshis = r.confirmedBalance;
+      this._store.unconfirmedBalanceSatoshis = r.unconfirmedBalance;
     } catch (err) {
       log.error('Getting wallet balance failed', err);
     }
@@ -410,8 +410,8 @@ class WalletAction {
   async getChannelBalance() {
     try {
       const r = await this._grpc.sendCommand('ChannelBalance');
-      this._store.channelBalanceSatoshis = parseSat(r.balance);
-      this._store.pendingBalanceSatoshis = parseSat(r.pendingOpenBalance);
+      this._store.channelBalanceSatoshis = r.balance;
+      this._store.pendingBalanceSatoshis = r.pendingOpenBalance;
     } catch (err) {
       log.error('Getting channel balance failed', err);
     }

src/helper.js

@@ -33,30 +33,14 @@ export const formatFiat = (val, currency) => {
 
 /**
  * Parse a unix time stamp to a JavaScript date object
- * @param  {string} timeStamp The unix time stamp in seconds
+ * @param  {number} timeStamp The unix time stamp in seconds
  * @return {Date}             The date object
  */
 export const parseDate = timeStamp => {
-  if (typeof timeStamp !== 'string' || !/^[0-9]+$/.test(timeStamp)) {
+  if (!Number.isInteger(timeStamp)) {
     throw new Error('Invalid input!');
   }
-  return new Date(parseInt(timeStamp, 10) * 1000);
-};
-
-/**
- * Parse satoshi values to an integer number
- * @param  {string} satoshis The integer value as a string
- * @return {number}          The satoshi integer as a number
- */
-export const parseSat = satoshis => {
-  if (typeof satoshis !== 'string' || !/^-*[0-9]+$/.test(satoshis)) {
-    throw new Error('Invalid input!');
-  }
-  satoshis = parseInt(satoshis, 10);
-  if (isNaN(satoshis)) {
-    throw new Error('Invalid input!');
-  }
-  return satoshis;
+  return new Date(timeStamp * 1000);
 };
 
 /**
@@ -84,7 +68,7 @@ export const toSatoshis = (amount, settings) => {
 
 /**
  * Convert satoshis to a BTC values than can set as a text input value
- * @param  {number} satoshis The value as a string or number
+ * @param  {number} satoshis The value as a number
  * @param  {Object} settings Contains the current exchange rate
  * @return {string}          The amount formatted as '0.0001'
  */

test/unit/action/channel.spec.js

@@ -92,9 +92,9 @@ describe('Action Channels Unit Tests', () => {
           {
             chanId: 42,
             active: true,
-            capacity: '100',
-            localBalance: '10',
-            remoteBalance: '90',
+            capacity: 100,
+            localBalance: 10,
+            remoteBalance: 90,
             channelPoint: 'FFFF:1',
           },
         ],
@@ -117,9 +117,9 @@ describe('Action Channels Unit Tests', () => {
   describe('getPendingChannels()', () => {
     const pendingChannel = {
       remoteNodePub: 'some-key',
-      capacity: '100',
-      localBalance: '10',
-      remoteBalance: '90',
+      capacity: 100,
+      localBalance: 10,
+      remoteBalance: 90,
       channelPoint: 'FFFF:1',
     };
 

test/unit/action/payment.spec.js

@@ -139,7 +139,7 @@ describe('Action Payments Unit Tests', () => {
   describe('decodeInvoice()', () => {
     it('should decode successfully', async () => {
       grpc.sendCommand.withArgs('decodePayReq').resolves({
-        numSatoshis: '1700',
+        numSatoshis: 1700,
         description: 'foo',
         destination: 'bar',
       });
@@ -150,7 +150,7 @@ describe('Action Payments Unit Tests', () => {
           numRoutes: 1,
         })
         .resolves({
-          routes: [{ totalFees: '100' }],
+          routes: [{ totalFees: 100 }],
         });
       const isValid = await payment.decodeInvoice({ invoice: 'some-invoice' });
       expect(isValid, 'to be', true);
@@ -171,7 +171,7 @@ describe('Action Payments Unit Tests', () => {
 
     it('should set no fee on query route error', async () => {
       grpc.sendCommand.withArgs('decodePayReq').resolves({
-        numSatoshis: '1700',
+        numSatoshis: 1700,
         description: 'foo',
         destination: 'bar',
       });

test/unit/action/transaction.spec.js

@@ -60,10 +60,10 @@ describe('Action Transactions Unit Tests', () => {
         transactions: [
           {
             txHash: 'some-hash',
-            amount: '42',
-            totalFees: '10',
+            amount: 42,
+            totalFees: 10,
             numConfirmations: 0,
-            timeStamp: '1527070395',
+            timeStamp: 1527070395,
           },
         ],
       });
@@ -84,10 +84,10 @@ describe('Action Transactions Unit Tests', () => {
         transactions: [
           {
             txHash: 'some-hash',
-            amount: '42',
-            totalFees: '10',
+            amount: 42,
+            totalFees: 10,
             numConfirmations: 1,
-            timeStamp: '1527070395',
+            timeStamp: 1527070395,
           },
         ],
       });
@@ -116,8 +116,8 @@ describe('Action Transactions Unit Tests', () => {
         invoices: [
           {
             rHash: Buffer.from('cdab', 'hex'),
-            creationDate: '1527070395',
-            value: '42',
+            creationDate: 1527070395,
+            value: 42,
             settled: true,
             memo: 'some-memo',
             r_preimage: 'some-preimage',
@@ -147,9 +147,9 @@ describe('Action Transactions Unit Tests', () => {
       grpc.sendCommand.withArgs('listPayments').resolves({
         payments: [
           {
-            creationDate: '1527070395',
-            value: '42',
-            fee: '10',
+            creationDate: 1527070395,
+            value: 42,
+            fee: 10,
             settled: true,
             paymentHash: 'some-hash',
           },

test/unit/action/wallet.spec.js

@@ -491,9 +491,9 @@ describe('Action Wallet Unit Tests', () => {
   describe('getBalance()', () => {
     it('should get wallet balance', async () => {
       grpc.sendCommand.withArgs('WalletBalance').resolves({
-        totalBalance: '1',
-        confirmedBalance: '2',
-        unconfirmedBalance: '3',
+        totalBalance: 1,
+        confirmedBalance: 2,
+        unconfirmedBalance: 3,
       });
       await wallet.getBalance();
       expect(store.balanceSatoshis, 'to equal', 1);
@@ -511,8 +511,8 @@ describe('Action Wallet Unit Tests', () => {
   describe('getChannelBalance()', () => {
     it('should get channel balance', async () => {
       grpc.sendCommand.withArgs('ChannelBalance').resolves({
-        balance: '1',
-        pendingOpenBalance: '2',
+        balance: 1,
+        pendingOpenBalance: 2,
       });
       await wallet.getChannelBalance();
       expect(store.channelBalanceSatoshis, 'to equal', 1);