merge from master

Author: moshababo

Diff for: .gitignore

@@ -41,6 +41,7 @@ typings/
 
 # Typescript compilation output
 dist/
+.tsbuildinfo
 
 # Optional npm cache directory
 .npm
@@ -72,3 +73,4 @@ docker/xud/xud.db
 
 # xud-simulation execution temp directory
 test/simulation/temp
+test/simulation/go

Diff for: .travis.yml

@@ -6,20 +6,12 @@ node_js:
 cache:
   directories:
     - "node_modules"
-    - $GOCACHE
-    - $GOPATH/pkg
-    - $GOPATH/bin
-    - $GOPATH/src/github.com/btcsuite
+    - "test/simulation/go" # lnd, btcd, and dependencies
+
+before_install:
+  - eval "$(GIMME_GO_VERSION=1.12 gimme)"
 
 script:
   - npm run lintNoFix
   - npm run test
-
-  # network simulation tests
-  - eval "$(GIMME_GO_VERSION=1.12 gimme)"
-  - go get -u github.com/golang/dep/cmd/dep
-  - go get -u github.com/btcsuite/btcd
-  - npm install
-  - npm run compile
   - npm run test:sim
-

Diff for: README.md

@@ -20,11 +20,11 @@ If you already have [Node.js](https://nodejs.org/en/download/) (min 10.15.3) ins
 sudo npm install xud -g --unsafe-perm
 ```
 
-Detailed instructions for installing `xud` can be found in the wiki on our [Installation](https://github.com/ExchangeUnion/xud/wiki/Installation) page. Instructions for installing via Docker are on our [Docker](https://github.com/ExchangeUnion/xud/wiki/Docker) page.
+Detailed instructions for installing `xud` can be found in the wiki on our [Installation](https://github.com/ExchangeUnion/xud/wiki/Installation) page.
 
 ## Usage
 
-Open a new terminal and launch `xud`. 
+Open a new terminal and launch `xud`.
 
 ```
 $ ./xud
@@ -55,4 +55,4 @@ All files in this repository are licensed under the [GNU Affero General Public L
 
 ## Development & Testing Discussion
 
-Comments, questions, and any development-related discussions are welcome in our [Gitter chat](https://gitter.im/exchangeunion/Lobby)
+Comments, questions, and any development-related discussions are welcome in our [Gitter chat](https://gitter.im/exchangeunion/Lobby)

Diff for: bin/xud

@@ -62,6 +62,10 @@ const { argv } = require('yargs')
       type: 'string',
       alias: 'x',
     },
+    'http.port': {
+      describe: 'Port to listen for http requests',
+      type: 'number',
+    },
     'lnd.[currency].certpath': {
       describe: 'Path to the SSL certificate for lnd',
       type: 'string',