Skip to content
This repository was archived by the owner on Feb 23, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ 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.

### Logs
Logs are written to the following locations:

* **Linux:** `~/.config/Lightning/log.log`
* **OSX:** `~/Library/Logs/Lightning/log.log`
* **Windows:** `%USERPROFILE%\AppData\Roaming\Lightning\log.log`

### Building

To build binaries for OSX:
Expand Down
2 changes: 1 addition & 1 deletion packages/lightning-core/accounts/reducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export const actions = {
[GRPC]: {
method: 'walletBalance',
schema: wallet => ({
wallet: wallet.balance * 100000000, // To SAT,
wallet: parseFloat(wallet.balance * 100000000), // To SAT,
}),
},
}),
Expand Down
5 changes: 4 additions & 1 deletion packages/lightning-core/pay/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import { actions as accountsActions } from '../accounts'
import { CurrencyInput, Head, Input, Page } from '../common'
import { sanitizePaymentRequest } from '../helpers'

export const Pay = ({ onMakePayment, onDecodePaymentRequest, onEditForm, onFetchAccount }) => {
export const Pay = ({ onMakePayment, onDecodePaymentRequest, onEditForm,
onFetchAccount, onFetchChannels }) => {
const fields = [
{
name: 'address',
Expand All @@ -27,6 +28,7 @@ export const Pay = ({ onMakePayment, onDecodePaymentRequest, onEditForm, onFetch
onMakePayment({ address, amount })
.then(() => {
onFetchAccount()
onFetchChannels()
clear()
})
// eslint-disable-next-line no-console
Expand Down Expand Up @@ -75,6 +77,7 @@ export default connect(
onDecodePaymentRequest: actions.decodePaymentRequest,
onEditForm: formActions.editForm,
onFetchAccount: accountsActions.fetchAccount,
onFetchChannels: accountsActions.fetchChannels,
}
)(Pay)

Expand Down
Binary file modified packages/lightning-desktop/assets/ln-logo.sketch
Binary file not shown.
Binary file added packages/lightning-desktop/bin/linux/btcd
Binary file not shown.
Binary file added packages/lightning-desktop/bin/linux/lnd
Binary file not shown.
8 changes: 7 additions & 1 deletion packages/lightning-desktop/main.development.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import _ from 'lodash'
import observe from 'observe'
import cp from 'child_process'
import ps from 'ps-node'
import fileLog from 'electron-log'
import os from 'os'
import lnd from './lnd'

Expand Down Expand Up @@ -35,6 +36,7 @@ const runProcesses = (processes, logs) => {
.then(() => {
console.log(`${ proc.name } Already Running`)
logs.push(`${ proc.name } Already Running`)
fileLog.info(`${ proc.name } Already Running`)
})
.catch(() => {
const plat = os.platform()
Expand All @@ -49,7 +51,10 @@ const runProcesses = (processes, logs) => {
})
runningProcesses.push(instance)
instance.stdout.on('data', data => logs.push(`${ proc.name }: ${ data }`))
instance.stderr.on('data', data => logs.push(`${ proc.name } Error: ${ data }`))
instance.stderr.on('data', (data) => {
logs.push(`${ proc.name } Error: ${ data }`)
fileLog.error(`${ proc.name }: ${ data }`)
})
} catch (error) {
console.log(`Caught Error When Starting ${ proc.name }: ${ error }`)
logs.push(`Caught Error When Starting ${ proc.name }: ${ error }`)
Expand Down Expand Up @@ -195,4 +200,5 @@ app.on('quit', () => {

process.on('uncaughtException', (error) => {
console.log('Caught Main Process Error:', error)
fileLog.error(`Main Process: ${ error }`)
})
4 changes: 1 addition & 3 deletions packages/lightning-desktop/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,8 @@ function startPack() {
]
).then(() => {
if (shouldBuildAll) {
// const archs = ['ia32', 'x64']
const archs = ['x64']
// const platforms = ['linux', 'win32', 'darwin']
const platforms = ['win32', 'darwin']
const platforms = ['linux', 'win32', 'darwin']

platforms.forEach((plat) => {
archs.forEach((arch) => {
Expand Down
1 change: 1 addition & 0 deletions packages/lightning-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"concurrently": "^3.1.0",
"css-loader": "^0.26.1",
"electron-debug": "^1.1.0",
"electron-log": "^2.2.6",
"electron-packager": "^8.4.0",
"electron-prebuilt": "^1.4.6",
"electron-window-state": "^4.0.1",
Expand Down