From 1a57e03df4474ee7e2e48c718511a18a3d07d01d Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Wed, 9 Dec 2020 11:03:45 +0100 Subject: [PATCH] loopd: pass macaroon root key ID in context --- loopd/macaroons.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/loopd/macaroons.go b/loopd/macaroons.go index 0c5b0fb..a716ba4 100644 --- a/loopd/macaroons.go +++ b/loopd/macaroons.go @@ -165,7 +165,12 @@ func (d *Daemon) startMacaroonService() error { // Create macaroon files for loop CLI to use if they don't exist. if !lnrpc.FileExists(d.cfg.MacaroonPath) { - ctx := context.Background() + // We don't offer the ability to rotate macaroon root keys yet, + // so just use the default one since the service expects some + // value to be set. + idCtx := macaroons.ContextWithRootKeyID( + context.Background(), macaroons.DefaultRootKeyID, + ) // We only generate one default macaroon that contains all // existing permissions (equivalent to the admin.macaroon in @@ -173,7 +178,7 @@ func (d *Daemon) startMacaroonService() error { // RPC. Add our debug permissions if required. allPermissions = append(allPermissions, debugPermissions...) loopMac, err := d.macaroonService.Oven.NewMacaroon( - ctx, bakery.LatestVersion, nil, allPermissions..., + idCtx, bakery.LatestVersion, nil, allPermissions..., ) if err != nil { return err