Merge pull request #337 from bhandras/macaroonpath_default

alexbosworth · web-flow · commit d389a93bd4e7 · 2021-02-11T10:07:47.000-08:00
loop: add sane default for --lnd.macaroonpath
diff --git a/loopd/config.go b/loopd/config.go
@@ -167,6 +167,11 @@ func DefaultConfig() Config {
 		LoopOutMaxParts: defaultLoopOutMaxParts,
 		Lnd: &lndConfig{
 			Host: "localhost:10009",
+			MacaroonPath: filepath.Join(
+				btcutil.AppDataDir("lnd", false),
+				"data", "chain", "bitcoin", DefaultNetwork,
+				"admin.macaroon",
+			),
 		},
 	}
 }
diff --git a/release_notes.md b/release_notes.md
@@ -19,3 +19,4 @@ This file tracks release notes for the loop client.
 #### Breaking Changes
 
 #### Bug Fixes
+* Default for `--lnd.macaroonpath` is set to the default path for the LND `admin.macaroon` (https://github.com/lightninglabs/loop/issues/336)

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,11 @@ func DefaultConfig() Config {`
`167`	`167`	`LoopOutMaxParts: defaultLoopOutMaxParts,`
`168`	`168`	`Lnd: &lndConfig{`
`169`	`169`	`Host: "localhost:10009",`
	`170`	`+ MacaroonPath: filepath.Join(`
	`171`	`+ btcutil.AppDataDir("lnd", false),`
	`172`	`+ "data", "chain", "bitcoin", DefaultNetwork,`
	`173`	`+ "admin.macaroon",`
	`174`	`+ ),`
`170`	`175`	`},`
`171`	`176`	`}`
`172`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,3 +19,4 @@ This file tracks release notes for the loop client.`
`19`	`19`	`#### Breaking Changes`
`20`	`20`
`21`	`21`	`#### Bug Fixes`
	`22`	+* Default for `--lnd.macaroonpath` is set to the default path for the LND `admin.macaroon` (https://github.com/lightninglabs/loop/issues/336)