Merge pull request #2 from lightninglabs/update-rpc

Update RPC

Author: casesandberg

.eslintrc.js

@@ -1 +1,6 @@
-module.exports = { extends: '@case/eslint-config' }
+module.exports = {
+  extends: '@case/eslint-config',
+  rules: {
+    'import/imports-first': 0,
+  }
+}

README.md

@@ -26,6 +26,24 @@ npm run setup
 
 If the window doesn't load after running `npm start`: try clicking on dev tools window and hitting `cmd-r` to refresh the window.
 
+### Building
+
+To build binaries for OSX:
+```
+cd $GOPATH/src/github.com/lightningnetwork/lnd
+git pull
+glide install
+go install . ./cmd/...
+```
+
+To build binaries for Windows:
+```
+cd $GOPATH/src/github.com/lightningnetwork/lnd
+git pull
+glide install
+GOOS=windows GOARCH=amd64 go build -v
+```
+
 ### Packaging
 To package the app for all platforms run `npm run package-all-electron`. Make sure you have xquartz `brew cask install xquartz` wine installed `brew install wine`. If you run into `ENFILE: file table overflow` as an error put `ulimit -n 2560` in your bash profile.
 

packages/lightning-core/accounts/ChannelListItem.js

@@ -15,6 +15,10 @@ const { Menu, MenuItem } = remote
 export const ChannelListItem = ({ id, capacity, localBalance, remoteBalance,
   active, status, hover, channelPoint, onShowPopup, onClosePopup, onCloseChannel,
   onSuccess, onFetchChannels }) => {
+  const pending = status === 'pending-open'
+               || status === 'pending-closing'
+               || status === 'pending-force-closing'
+
   const styles = reactCSS({
     'default': {
       channel: {
@@ -86,9 +90,9 @@ export const ChannelListItem = ({ id, capacity, localBalance, remoteBalance,
         background: 'light-gray',
       },
     },
-  }, { hover, pending: status === 'pending' || status === 'closing' })
+  }, { hover, pending })
 
-  const PROMPT = 'CHANNEL_LIST/PROMPT'
+  const PROMPT = `CHANNEL_LIST/PROMPT-${ channelPoint }`
 
   // eslint-disable-next-line
   const close = ({ channelPoint, force }) => {
@@ -112,13 +116,19 @@ export const ChannelListItem = ({ id, capacity, localBalance, remoteBalance,
   const handleCancel = () => onClosePopup(PROMPT)
 
   const width = `${ (localBalance / capacity) * 100 }%`
+  const title = {
+    'open': `CID: ${ id }`,
+    'pending-open': 'OPENING',
+    'pending-closing': 'CLOSING',
+    'pending-force-closing': 'CLOSING',
+  }[status]
 
   return (
     <div style={ styles.channel } onContextMenu={ handleMenu }>
       <div style={ styles.split }>
         <div style={ styles.id }>
-          { status === 'pending' ? 'PENDING' : `CID:${ id }` }
-          { status !== 'pending' && status !== 'closing' && (
+          { title }
+          { !pending && (
             <div style={ styles.closeLabel } onClick={ showPopupOrClose }>
               <Icon small name="close" />
             </div>

packages/lightning-core/accounts/Wallet.js

@@ -70,12 +70,15 @@ export const Wallet = ({ pubkey, balances }) => {
       label: 'In Channels',
       amount: balances.channel,
     },
-    // {
-    //   label: 'Frozen',
-    //   amount: '2,510',
-    // },
   ]
 
+  if (balances.limbo) {
+    breakdown.push({
+      label: 'In Limbo',
+      amount: balances.limbo,
+    })
+  }
+
   return (
     <div style={ styles.bg }>
       <div style={ styles.title }>Your Wallet</div>

packages/lightning-core/accounts/reducer.js

@@ -26,6 +26,7 @@ const initialState = {
     channel: 0,
   },
   channels: [],
+  pendingChannels: [],
   loadingChannels: false,
 }
 
@@ -42,10 +43,19 @@ export default (state = initialState, action) => {
     case SET_BALANCES:
       return { ...state, balances: { ...state.balances, ...action.balances } }
     case PENDING_CHANNELS:
+      return {
+        ...state,
+        pendingChannels: action.pendingChannels,
+        balances: {
+          ...state.balances,
+          limbo: action.limboBalance,
+        },
+        loadingChannels: false,
+      }
     case FETCH_CHANNELS:
       return {
         ...state,
-        channels: _.uniqBy([...action.channels, ...state.channels], 'channelPoint'),
+        channels: action.channels,
         loadingChannels: false,
       }
     case START_CLOSING_CHANNEL:
@@ -114,17 +124,56 @@ export const actions = {
     [GRPC]: {
       method: 'pendingChannels',
       types: [null, PENDING_CHANNELS, FETCH_CHANNELS_FAILURE],
-      schema: data => ({
-        channels: _.map(data.pending_channels, channel => ({
-          remotePubkey: channel.identity_key,
-          id: 'PENDING',
-          capacity: channel.capacity,
-          localBalance: channel.local_balance,
-          remoteBalance: channel.remote_balance,
-          channelPoint: channel.channel_point,
-          status: channel.status,
-        })),
-      }),
+      schema: (data) => {
+        const decorateChannels = (channels, transform) =>
+          _.map(channels, channel => ({
+            remotePubkey: channel.remote_node_pub,
+            capacity: channel.capacity,
+            localBalance: channel.local_balance,
+            remoteBalance: channel.remote_balance,
+            channelPoint: channel.channel_point,
+            ...transform(channel),
+          }))
+
+        return {
+          pendingChannels: [
+            ...decorateChannels(data.pending_open_channels, () => ({ status: 'pending-open' })),
+            ...decorateChannels(data.pending_closing_channels, () => ({ status: 'pending-closing' })),
+            ...decorateChannels(data.pending_force_closing_channels, () => ({ status: 'pending-force-closing' })),
+            // {
+            //   remotePubkey: '1asd78964b54ad8f8og7a59sfg6s4d7f6g4a538dfs97gsd',
+            //   id: '1925401284578204',
+            //   capacity: '40000',
+            //   localBalance: '4000',
+            //   remoteBalance: '36000',
+            //   channelPoint: '1',
+            //   status: 'open',
+            // }, {
+            //   remotePubkey: 'asd0fg864a8df79g876adf98g69sd86f7g46s8d68f57gi6',
+            //   capacity: '4000',
+            //   localBalance: '2000',
+            //   remoteBalance: '2000',
+            //   channelPoint: '2',
+            //   status: 'pending-open',
+            // }, {
+            //   remotePubkey: 'vafgg3zf789s78df97a0s9f867g3s6df5fdgsghafd9hg876ad',
+            //   capacity: '100000',
+            //   localBalance: '90000',
+            //   remoteBalance: '10000',
+            //   channelPoint: '3',
+            //   status: 'pending-closing',
+            // }, {
+            //   remotePubkey: 'xzcb8976d4bv645z657v6ba6pfdb9s8d7gb537sf6g43b42s3',
+            //   capacity: '4400',
+            //   localBalance: '1900',
+            //   remoteBalance: '2500',
+            //   channelPoint: '4',
+            //   status: 'pending-force-closing',
+            // },
+          ],
+          limboBalance: parseInt(data.total_limbo_balance, 0),
+        }
+      },
     },
   }),
   listChannels: () => ({
@@ -246,6 +295,9 @@ export const selectors = {
   getAccountPubkey: state => state.pubkey,
   getCurrency: state => state.currency,
   getAccountBalances: state => state.balances,
-  getChannels: state => state.channels || [],
+  getChannels: (state) => {
+    const channels = [...state.channels, ...state.pendingChannels]
+    return channels.length ? channels : []
+  },
   getChannelsLoading: state => state.loadingChannels,
 }

packages/lightning-core/common/Streams.js

@@ -11,6 +11,7 @@ export class Streams extends React.Component {
   componentWillReceiveProps(nextProps) {
     if (this.props.serverRunning === false && nextProps.serverRunning === true) {
       this.props.onFetchAccount()
+      this.props.onFetchChannels()
 
       this.interval = setInterval(() => {
         // POLL

packages/lightning-desktop/main.development.js

@@ -60,17 +60,17 @@ const runProcesses = (processes, logs) => {
 
 const logBuffer = []
 const logs = observe(logBuffer)
-const network = isDev ? '--simnet' : '--testnet'
 const miningaddr = isDev ? '--miningaddr=4NyWssGkW6Nbwj3nXrJU54U2ijHgWaKZ1N19w' : ''
 
 const processes = [
   {
     name: 'lnd',
     args: [
-      '--btcdhost=127.0.0.1',
-      '--rpcuser=kek',
-      '--rpcpass=kek',
-      network,
+      '--bitcoin.active',
+      '--bitcoin.rpchost=localhost',
+      '--bitcoin.rpcuser=kek',
+      '--bitcoin.rpcpass=kek',
+      isDev ? '--bitcoin.simnet' : '--bitcoin.testnet',
       '--debuglevel=debug',
       '--debughtlc',
     ],
@@ -79,7 +79,7 @@ const processes = [
     args: [
       '--rpcuser=kek',
       '--rpcpass=kek',
-      network,
+      isDev ? '--simnet' : '--testnet',
       miningaddr,
       '--txindex',
     ],
@@ -129,7 +129,7 @@ const createWindow = () => {
 
   setInterval(() => {
     try {
-      mainWindow.webContents.send('logs', logQueue)
+      logQueue.length && mainWindow.webContents.send('logs', logQueue)
       logQueue = []
     } catch (err) {
       console.log('WARNING: App Was Closed While Writing Logs')

packages/lightning-desktop/rpc.proto

@@ -312,6 +312,8 @@ message GetInfoResponse {
 
     bool synced_to_chain = 9 [ json_name = "synced_to_chain" ];
     bool testnet = 10 [ json_name = "testnet" ];
+
+    repeated string chains = 11[ json_name = "chains" ] ;
 }
 
 message ConfirmationUpdate {
@@ -367,29 +369,47 @@ message OpenStatusUpdate {
     }
 }
 
-enum ChannelStatus {
-    ALL = 0;
-    OPENING = 1;
-    CLOSING = 2;
-}
-message PendingChannelRequest {
-    ChannelStatus status = 1;
-}
+message PendingChannelRequest {}
 message PendingChannelResponse {
     message PendingChannel {
-        string identity_key = 1 [ json_name = "identity_key" ];
+        string remote_node_pub = 1 [ json_name = "remote_node_pub" ];
         string channel_point = 2 [ json_name = "channel_point" ];
 
         int64 capacity = 3 [ json_name = "capacity" ];
+
         int64 local_balance = 4 [ json_name = "local_balance" ];
         int64 remote_balance = 5 [ json_name = "remote_balance" ];
+    }
+
+    message PendingOpenChannel {
+        PendingChannel channel = 1 [ json_name = "channel" ];
+
+        uint32 confirmation_height = 2 [ json_name = "confirmation_height" ];
+        uint32 blocks_till_open = 3 [ json_name = "blocks_till_open" ];
+    }
+
+    message ClosedChannel {
+        PendingChannel channel = 1;
+
+        string closing_txid = 2 [ json_name = "closing_txid" ];
+    }
+
+    message ForceClosedChannel {
+        PendingChannel channel = 1 [ json_name = "channel" ];
+
+        // TODO(roasbeef): HTLC's as well?
 
-        string closing_txid = 6 [ json_name = "closing_txid" ];
+        string closing_txid = 2 [ json_name = "closing_txid" ];
 
-        ChannelStatus status = 7 [ json_name = "status" ];
+        int64 limbo_balance = 3 [ json_name = "limbo_balance" ];
+        uint32 maturity_height = 4 [ json_name = "maturity_height" ];
+        uint32 blocks_til_maturity = 5 [ json_name = "blocks_til_maturity" ];
     }
 
-    repeated PendingChannel pending_channels = 1 [ json_name = "pending_channels" ];
+    int64 total_limbo_balance = 1 [ json_name = "total_limbo_balance" ];
+    repeated PendingOpenChannel pending_open_channels = 2 [ json_name = "pending_open_channels" ];
+    repeated ClosedChannel pending_closing_channels = 3 [ json_name = "pending_closing_channels" ];
+    repeated ForceClosedChannel pending_force_closing_channels =  4 [ json_name = "pending_force_closing_channels" ];
 }
 
 message WalletBalanceRequest {