diff --git a/Gopkg.lock b/Gopkg.lock
index 048548d3ac5..bfa5ac4a645 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -3,22 +3,27 @@
 
 [[projects]]
   branch = "master"
+  digest = "1:1825a371f557bcbc26b3e88bd6ab19ab42435e11e9b3b248bf1e0882cf5d5d0a"
   name = "git.schwanenlied.me/yawning/bsaes.git"
   packages = [
     "ct32",
     "ct64",
     "ghash",
-    "internal/modes"
+    "internal/modes",
   ]
+  pruneopts = "UT"
   revision = "c0276d75487ef7aceab140c9eb31601dd7d18bd4"
 
 [[projects]]
   branch = "master"
+  digest = "1:9a112e9f617878a9a643fdfcb7c31afaf0cf8859b8c179bf6bf53f9f881be695"
   name = "github.com/NebulousLabs/fastrand"
   packages = ["."]
+  pruneopts = "UT"
   revision = "3cf7173006a0b7d2371fa1a220da7f9d48c7827c"
 
 [[projects]]
+  digest = "1:a940cbe66b93cfbd21916d06dca51a4f68cf0fccb95d7f0d80f4e127347e6e5e"
   name = "github.com/NebulousLabs/go-upnp"
   packages = [
     ".",
@@ -27,30 +32,38 @@
     "goupnp/httpu",
     "goupnp/scpd",
     "goupnp/soap",
-    "goupnp/ssdp"
+    "goupnp/ssdp",
   ]
+  pruneopts = "UT"
   revision = "29b680b06c82d044ebea91bf3069038eb562df2a"
 
 [[projects]]
+  digest = "1:c9ef1fba766e914747fa05a9947a6312fb0ee0ddb89218b1d96dd28b5d17b67e"
   name = "github.com/Yawning/aez"
   packages = ["."]
+  pruneopts = "UT"
   revision = "4dad034d9db2caec23fb8f69b9160ae16f8d46a3"
 
 [[projects]]
   branch = "master"
+  digest = "1:e05c7b72aeba7570b1d2f9c6dc9f0373d224b16b70fa886c504de867bffe1c2e"
   name = "github.com/aead/chacha20"
   packages = [
     ".",
-    "chacha"
+    "chacha",
   ]
+  pruneopts = "UT"
   revision = "8b13a72661dae6e9e5dea04f344f0dc95ea29547"
 
 [[projects]]
+  digest = "1:1c10bf6793afd790b0949d5384403d8d4850bf8f5f72ab6fc232277daaa5057b"
   name = "github.com/aead/siphash"
   packages = ["."]
+  pruneopts = "UT"
   revision = "83563a290f60225eb120d724600b9690c3fb536f"
 
 [[projects]]
+  digest = "1:e0ab2aba19fe77b2367828b186e46a5efa57d35a94df282ae25adf624136ae5c"
   name = "github.com/btcsuite/btcd"
   packages = [
     "addrmgr",
@@ -65,16 +78,20 @@
     "peer",
     "rpcclient",
     "txscript",
-    "wire"
+    "wire",
   ]
+  pruneopts = "UT"
   revision = "79e00513b1011888b1e675157ab89f527f901cae"
 
 [[projects]]
+  digest = "1:30d4a548e09bca4a0c77317c58e7407e2a65c15325e944f9c08a7b7992f8a59e"
   name = "github.com/btcsuite/btclog"
   packages = ["."]
+  pruneopts = "UT"
   revision = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a"
 
 [[projects]]
+  digest = "1:9986a18c52a15d321aeae4c0dacf99e0d3edd2815d76489a847c4196731ef974"
   name = "github.com/btcsuite/btcutil"
   packages = [
     ".",
@@ -83,11 +100,13 @@
     "gcs",
     "gcs/builder",
     "hdkeychain",
-    "txsort"
+    "txsort",
   ]
+  pruneopts = "UT"
   revision = "ab6388e0c60ae4834a1f57511e20c17b5f78be4b"
 
 [[projects]]
+  digest = "1:ac01796bf202b80d6cb1b92d42df0fbbf3aff964451376bfa7c39bc2bf94d108"
   name = "github.com/btcsuite/btcwallet"
   packages = [
     "chain",
@@ -104,24 +123,30 @@
     "wallet/txrules",
     "walletdb",
     "walletdb/bdb",
-    "wtxmgr"
+    "wtxmgr",
   ]
+  pruneopts = "UT"
   revision = "c4dd27e481f9801866cf5226bfe532084772ec2a"
 
 [[projects]]
   branch = "master"
+  digest = "1:f5a785a2836dce1d5a46a313275fe868c332090a3709b5aa58b84e1368ae006f"
   name = "github.com/btcsuite/fastsha256"
   packages = ["."]
+  pruneopts = "UT"
   revision = "637e656429416087660c84436a2a035d69d54e2e"
 
 [[projects]]
   branch = "master"
+  digest = "1:1e6b2f7aa98b082c30a1303c29a702c369b2ec6d86b74a599bc8bbe2333db299"
   name = "github.com/btcsuite/go-socks"
   packages = ["socks"]
+  pruneopts = "UT"
   revision = "4720035b7bfd2a9bb130b1c184f8bbe41b6f0d0f"
 
 [[projects]]
   branch = "master"
+  digest = "1:1b64109c911550cddc81aa2146700c28e663ccb552e75018d940f050f081cc26"
   name = "github.com/btcsuite/golangcrypto"
   packages = [
     "nacl/secretbox",
@@ -130,44 +155,58 @@
     "ripemd160",
     "salsa20/salsa",
     "scrypt",
-    "ssh/terminal"
+    "ssh/terminal",
   ]
+  pruneopts = "UT"
   revision = "53f62d9b43e87a6c56975cf862af7edf33a8d0df"
 
 [[projects]]
   branch = "master"
+  digest = "1:0b2242fd2f4f51fb491e97e204464f75da680897a0db10ec7554c87b71b5afc3"
   name = "github.com/btcsuite/websocket"
   packages = ["."]
+  pruneopts = "UT"
   revision = "31079b6807923eb23992c421b114992b95131b55"
 
 [[projects]]
+  digest = "1:e802928326e2d631840a238c372417c3ade751b79ff491c5f0a4755c912643cd"
   name = "github.com/coreos/bbolt"
   packages = ["."]
+  pruneopts = "UT"
   revision = "4f5275f4ebbf6fe7cb772de987fa96ee674460a7"
 
 [[projects]]
+  digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec"
   name = "github.com/davecgh/go-spew"
   packages = ["spew"]
+  pruneopts = "UT"
   revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"
 
 [[projects]]
+  digest = "1:2cd7915ab26ede7d95b8749e6b1f933f1c6d5398030684e6505940a10f31cfda"
   name = "github.com/ghodss/yaml"
   packages = ["."]
+  pruneopts = "UT"
   revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
   version = "v1.0.0"
 
 [[projects]]
+  digest = "1:aacef5f5e45685f2aeda5534d0a750dee6859de7e9088cdd06192787bb01ae6d"
   name = "github.com/go-errors/errors"
   packages = ["."]
+  pruneopts = "UT"
   revision = "a6af135bd4e28680facf08a3d206b454abc877a4"
 
 [[projects]]
   branch = "master"
+  digest = "1:1ba1d79f2810270045c328ae5d674321db34e3aae468eb4233883b473c5c0467"
   name = "github.com/golang/glog"
   packages = ["."]
+  pruneopts = "UT"
   revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"
 
 [[projects]]
+  digest = "1:6d66e8a865219bc05273b10cfc81fad65f0b9023285c0f2770bd5c3a20d22654"
   name = "github.com/golang/protobuf"
   packages = [
     "jsonpb",
@@ -180,11 +219,13 @@
     "ptypes/any",
     "ptypes/duration",
     "ptypes/struct",
-    "ptypes/timestamp"
+    "ptypes/timestamp",
   ]
+  pruneopts = "UT"
   revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265"
 
 [[projects]]
+  digest = "1:57cd9e9c7e1f2d6eff4d778c14d4c0982194e5f75a6d790a3251a2992e657f5f"
   name = "github.com/grpc-ecosystem/grpc-gateway"
   packages = [
     "codegenerator",
@@ -192,49 +233,65 @@
     "protoc-gen-grpc-gateway/httprule",
     "runtime",
     "runtime/internal",
-    "utilities"
+    "utilities",
   ]
+  pruneopts = "UT"
   revision = "92583770e3f01b09a0d3e9bdf64321d8bebd48f2"
 
 [[projects]]
+  digest = "1:6b8866cc9496eada254debc24199981e21fd70fd0031ff7a581ac91be47187bb"
   name = "github.com/jackpal/gateway"
   packages = ["."]
+  pruneopts = "UT"
   revision = "3e333950771011fed13be63e62b9f473c5e0d9bf"
   version = "v1.0.4"
 
 [[projects]]
+  digest = "1:e4615e78931f6067795aec8fd1ba51ee03a6f64900de01ed3ae31973ae4273d7"
   name = "github.com/jackpal/go-nat-pmp"
   packages = ["."]
+  pruneopts = "UT"
   revision = "28a68d0c24adce1da43f8df6a57340909ecd7fdd"
 
 [[projects]]
+  digest = "1:580a0575cc73027105fcac15aa61aeef0bc15760a7718bd1d3e0c9f2660be559"
   name = "github.com/jessevdk/go-flags"
   packages = ["."]
+  pruneopts = "UT"
   revision = "f88afde2fa19a30cf50ba4b05b3d13bc6bae3079"
 
 [[projects]]
+  digest = "1:4b6a85c651ea3faa6dfb4e6de5249b602226270b9eb3dfb8f49ec91fa3ef08ff"
   name = "github.com/jrick/logrotate"
   packages = ["rotator"]
+  pruneopts = "UT"
   revision = "a93b200c26cbae3bb09dd0dc2c7c7fe1468a034a"
 
 [[projects]]
   branch = "master"
+  digest = "1:a330103bc9731260ee9fa14764e9e3fce46e02de19d6aca3eeba1d425badfbf0"
   name = "github.com/juju/loggo"
   packages = ["."]
+  pruneopts = "UT"
   revision = "584905176618da46b895b176c721b02c476b6993"
 
 [[projects]]
+  digest = "1:ed05f40f6e39c5040819444f4379192346008107ddcc79f02f0729985b5160b4"
   name = "github.com/kkdai/bstream"
   packages = ["."]
+  pruneopts = "UT"
   revision = "f391b8402d23024e7c0f624b31267a89998fca95"
 
 [[projects]]
   branch = "master"
+  digest = "1:a86b813d259a63f7a15c4aa9c24c60f082e2ee28197b07bc67d7d2aa8a94c1ce"
   name = "github.com/lightninglabs/gozmq"
   packages = ["."]
+  pruneopts = "UT"
   revision = "462a8a75388506b68f76661af8d649f0b88e5301"
 
 [[projects]]
+  digest = "1:9d36cf09ab96eba14b70775f1284fa9741a212d2b49c08750b7112f9545a807b"
   name = "github.com/lightninglabs/neutrino"
   packages = [
     ".",
@@ -242,70 +299,88 @@
     "cache/lru",
     "filterdb",
     "headerfs",
-    "headerlist"
+    "headerlist",
   ]
+  pruneopts = "UT"
   revision = "9a42f7df21be82a69f04caa83bce4034dca72764"
 
 [[projects]]
+  digest = "1:58ab6d6525898cbeb86dc29a68f8e9bfe95254b9032134eb9458779574872260"
   name = "github.com/lightningnetwork/lightning-onion"
   packages = ["."]
+  pruneopts = "UT"
   revision = "ac4d9da8f1d67c95f1fafdc65e1a4902d6f5a940"
 
 [[projects]]
+  digest = "1:3402f61a37575d808e4499dbfda1ab756d570c66cdfed492b84a936bbb909533"
   name = "github.com/ltcsuite/ltcd"
   packages = [
     "chaincfg",
     "chaincfg/chainhash",
-    "wire"
+    "wire",
   ]
+  pruneopts = "UT"
   revision = "cdab10132e8c6e4a3ffd112dba54791946d28906"
 
 [[projects]]
+  digest = "1:a0bf6f18ffeb4a45fd00d5eb16d918769bbe0e2dc7824e95abf05a3306f60102"
   name = "github.com/miekg/dns"
   packages = [
     ".",
-    "internal/socket"
+    "internal/socket",
   ]
+  pruneopts = "UT"
   revision = "79bfde677fa81ff8d27c4330c35bda075d360641"
 
 [[projects]]
   branch = "master"
+  digest = "1:0597105be82a6bf3ddab07ab19402142f60b7329844712fc22ed21946864cb2f"
   name = "github.com/roasbeef/btcd"
   packages = [
     "btcec",
     "chaincfg",
     "chaincfg/chainhash",
-    "wire"
+    "wire",
   ]
+  pruneopts = "UT"
   revision = "a03db407e40d3b66ea29984263bbc8bf4d2f04c4"
 
 [[projects]]
   branch = "master"
+  digest = "1:a3780cd4884824a3a274c6c7f967c097cfebb0b8af9eddf1441e9f5d3f30e468"
   name = "github.com/roasbeef/btcutil"
   packages = [
     ".",
     "base58",
-    "bech32"
+    "bech32",
   ]
+  pruneopts = "UT"
   revision = "dfb640c57141f1c2113b92b4b16d2a89c30dd258"
 
 [[projects]]
   branch = "master"
+  digest = "1:d673e95129a1107bfd04e093751a5e1267faabc27d218d824fb013f57ac08f55"
   name = "github.com/rogpeppe/fastuuid"
   packages = ["."]
+  pruneopts = "UT"
   revision = "6724a57986aff9bff1a1770e9347036def7c89f6"
 
 [[projects]]
+  digest = "1:4cc492dc59eae18d3b05efc89f7ed68788258e34c5b0ea48834769fc823849e6"
   name = "github.com/tv42/zbase32"
   packages = ["."]
+  pruneopts = "UT"
   revision = "501572607d0273fc75b3b261fa4904d63f6ffa0e"
 
 [[projects]]
+  digest = "1:46ed28d956228a4113be4e08ba8fae6d78b154bbf78cb7c2108ab157faaac8dc"
   name = "github.com/urfave/cli"
   packages = ["."]
+  pruneopts = "UT"
   revision = "1efa31f08b9333f1bd4882d61f9d668a70cd902e"
 
 [[projects]]
+  digest = "1:270627be1fb5b0875bdbf8a96f86a551adc0aeba97fb63af3caaa21c0a39c499"
   name = "golang.org/x/crypto"
   packages = [
     "blake2b",
@@ -322,11 +397,13 @@
     "salsa20",
     "salsa20/salsa",
     "scrypt",
-    "ssh/terminal"
+    "ssh/terminal",
   ]
+  pruneopts = "UT"
   revision = "614d502a4dac94afa3a6ce146bd1736da82514c6"
 
 [[projects]]
+  digest = "1:0764abb1e99bb977d1b9f320d02859d4a737252da3e1fd233c4ae0f9522e7446"
   name = "golang.org/x/net"
   packages = [
     "context",
@@ -339,20 +416,24 @@
     "internal/timeseries",
     "lex/httplex",
     "proxy",
-    "trace"
+    "trace",
   ]
+  pruneopts = "UT"
   revision = "ae89d30ce0c63142b652837da33d782e2b0a9b25"
 
 [[projects]]
+  digest = "1:576f8d82185dc836ec6d10c0e5568dc4ff94e4d9f101d33ed5d6bae0cbba65b2"
   name = "golang.org/x/sys"
   packages = [
     "cpu",
     "unix",
-    "windows"
+    "windows",
   ]
+  pruneopts = "UT"
   revision = "ebe1bf3edb3325c393447059974de898d5133eb8"
 
 [[projects]]
+  digest = "1:436b24586f8fee329e0dd65fd67c817681420cda1d7f934345c13fe78c212a73"
   name = "golang.org/x/text"
   packages = [
     "collate",
@@ -380,25 +461,31 @@
     "unicode/bidi",
     "unicode/cldr",
     "unicode/norm",
-    "unicode/rangetable"
+    "unicode/rangetable",
   ]
+  pruneopts = "UT"
   revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
   version = "v0.3.0"
 
 [[projects]]
+  digest = "1:c9e7a4b4d47c0ed205d257648b0e5b0440880cb728506e318f8ac7cd36270bc4"
   name = "golang.org/x/time"
   packages = ["rate"]
+  pruneopts = "UT"
   revision = "fbb02b2291d28baffd63558aa44b4b56f178d650"
 
 [[projects]]
+  digest = "1:c2dee8dbcc504d1a7858f5dbaed7c8b256c512c5e9e81480158c30185bbd2792"
   name = "google.golang.org/genproto"
   packages = [
     "googleapis/api/annotations",
-    "googleapis/rpc/status"
+    "googleapis/rpc/status",
   ]
+  pruneopts = "UT"
   revision = "df60624c1e9b9d2973e889c7a1cff73155da81c4"
 
 [[projects]]
+  digest = "1:96731923a0f205745214d5cede06375aff1fed607b888a04768558da7856ca9d"
   name = "google.golang.org/grpc"
   packages = [
     ".",
@@ -427,38 +514,120 @@
     "stats",
     "status",
     "tap",
-    "test/bufconn"
+    "test/bufconn",
   ]
+  pruneopts = "UT"
   revision = "8dea3dc473e90c8179e519d91302d0597c0ca1d1"
 
 [[projects]]
+  digest = "1:9f0c81ca4b497d3723d0a66495d8a1efe277068b77ef3ad2d6460e480bf09bb3"
   name = "gopkg.in/errgo.v1"
   packages = ["."]
+  pruneopts = "UT"
   revision = "b20caedf0710d0988e92b5f2d76843ad1f231f2d"
 
 [[projects]]
+  digest = "1:f75654fe9e7a52c9df4c13d3c362a02e9dd0ab5e1ef336212ae68964c05ff53f"
   name = "gopkg.in/macaroon-bakery.v2"
   packages = [
     "bakery",
     "bakery/checkers",
-    "bakery/internal/macaroonpb"
+    "bakery/internal/macaroonpb",
   ]
+  pruneopts = "UT"
   revision = "94012773d2874a067572bd16d7d11ae02968b47b"
 
 [[projects]]
+  digest = "1:0622939c131fd6ca6fc9dfb25adda2f195062975045baba7ad94607e6f3c52b7"
   name = "gopkg.in/macaroon.v2"
   packages = ["."]
+  pruneopts = "UT"
   revision = "bed2a428da6e56d950bed5b41fcbae3141e5b0d0"
 
 [[projects]]
+  digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202"
   name = "gopkg.in/yaml.v2"
   packages = ["."]
+  pruneopts = "UT"
   revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
   version = "v2.2.1"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "c4f30551f3a8d95a1ae58f2570086ccc764599847ba771d31c3328d98a139aea"
+  input-imports = [
+    "github.com/NebulousLabs/go-upnp",
+    "github.com/Yawning/aez",
+    "github.com/btcsuite/btcd/blockchain",
+    "github.com/btcsuite/btcd/btcec",
+    "github.com/btcsuite/btcd/btcjson",
+    "github.com/btcsuite/btcd/chaincfg",
+    "github.com/btcsuite/btcd/chaincfg/chainhash",
+    "github.com/btcsuite/btcd/connmgr",
+    "github.com/btcsuite/btcd/integration/rpctest",
+    "github.com/btcsuite/btcd/rpcclient",
+    "github.com/btcsuite/btcd/txscript",
+    "github.com/btcsuite/btcd/wire",
+    "github.com/btcsuite/btclog",
+    "github.com/btcsuite/btcutil",
+    "github.com/btcsuite/btcutil/bech32",
+    "github.com/btcsuite/btcutil/gcs/builder",
+    "github.com/btcsuite/btcutil/hdkeychain",
+    "github.com/btcsuite/btcutil/txsort",
+    "github.com/btcsuite/btcwallet/chain",
+    "github.com/btcsuite/btcwallet/snacl",
+    "github.com/btcsuite/btcwallet/waddrmgr",
+    "github.com/btcsuite/btcwallet/wallet",
+    "github.com/btcsuite/btcwallet/wallet/txrules",
+    "github.com/btcsuite/btcwallet/walletdb",
+    "github.com/btcsuite/btcwallet/walletdb/bdb",
+    "github.com/btcsuite/btcwallet/wtxmgr",
+    "github.com/btcsuite/fastsha256",
+    "github.com/coreos/bbolt",
+    "github.com/davecgh/go-spew/spew",
+    "github.com/go-errors/errors",
+    "github.com/golang/glog",
+    "github.com/golang/protobuf/jsonpb",
+    "github.com/golang/protobuf/proto",
+    "github.com/golang/protobuf/protoc-gen-go/generator",
+    "github.com/grpc-ecosystem/grpc-gateway/codegenerator",
+    "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/descriptor",
+    "github.com/grpc-ecosystem/grpc-gateway/runtime",
+    "github.com/grpc-ecosystem/grpc-gateway/utilities",
+    "github.com/jackpal/gateway",
+    "github.com/jackpal/go-nat-pmp",
+    "github.com/jessevdk/go-flags",
+    "github.com/jrick/logrotate/rotator",
+    "github.com/kkdai/bstream",
+    "github.com/lightninglabs/neutrino",
+    "github.com/lightningnetwork/lightning-onion",
+    "github.com/ltcsuite/ltcd/chaincfg",
+    "github.com/ltcsuite/ltcd/wire",
+    "github.com/miekg/dns",
+    "github.com/roasbeef/btcutil",
+    "github.com/tv42/zbase32",
+    "github.com/urfave/cli",
+    "golang.org/x/crypto/chacha20poly1305",
+    "golang.org/x/crypto/hkdf",
+    "golang.org/x/crypto/ripemd160",
+    "golang.org/x/crypto/salsa20",
+    "golang.org/x/crypto/scrypt",
+    "golang.org/x/crypto/ssh/terminal",
+    "golang.org/x/net/context",
+    "golang.org/x/net/proxy",
+    "golang.org/x/time/rate",
+    "google.golang.org/genproto/googleapis/api/annotations",
+    "google.golang.org/grpc",
+    "google.golang.org/grpc/codes",
+    "google.golang.org/grpc/credentials",
+    "google.golang.org/grpc/grpclog",
+    "google.golang.org/grpc/metadata",
+    "google.golang.org/grpc/peer",
+    "google.golang.org/grpc/status",
+    "google.golang.org/grpc/test/bufconn",
+    "gopkg.in/macaroon-bakery.v2/bakery",
+    "gopkg.in/macaroon-bakery.v2/bakery/checkers",
+    "gopkg.in/macaroon.v2",
+  ]
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/daemon/rpcserver.go b/daemon/rpcserver.go
index f273d216bc5..43019d16e1f 100644
--- a/daemon/rpcserver.go
+++ b/daemon/rpcserver.go
@@ -22,7 +22,7 @@ import (
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/btcwallet/waddrmgr"
-	"github.com/coreos/bbolt"
+	bolt "github.com/coreos/bbolt"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/lightningnetwork/lnd/build"
 	"github.com/lightningnetwork/lnd/channeldb"
diff --git a/daemon/server.go b/daemon/server.go
index 8e41cea0d68..547f47e55e3 100644
--- a/daemon/server.go
+++ b/daemon/server.go
@@ -22,9 +22,9 @@ import (
 	"github.com/btcsuite/btcd/connmgr"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcutil"
-	"github.com/coreos/bbolt"
+	bolt "github.com/coreos/bbolt"
 	"github.com/go-errors/errors"
-	"github.com/lightningnetwork/lightning-onion"
+	sphinx "github.com/lightningnetwork/lightning-onion"
 	"github.com/lightningnetwork/lnd/autopilot"
 	"github.com/lightningnetwork/lnd/brontide"
 	"github.com/lightningnetwork/lnd/channeldb"
diff --git a/main.go b/main.go
index 5ef9c540674..9469108571d 100644
--- a/main.go
+++ b/main.go
@@ -13,7 +13,7 @@ func main() {
 	// Call the "real" main in a nested manner so the defers will properly
 	// be executed in the case of a graceful shutdown.
 	appDir := btcutil.AppDataDir("lnd", false)
-	if err := daemon.LndMain(appDir, nil); err != nil {
+	if err := daemon.LndMain(appDir, nil, nil); err != nil {
 		if e, ok := err.(*flags.Error); ok && e.Type == flags.ErrHelp {
 		} else {
 			fmt.Fprintln(os.Stderr, err)