From aaf4f27ab618f300d54ce213c223f4ce5de85159 Mon Sep 17 00:00:00 2001
From: Andras Banki-Horvath <bhandras@gmail.com>
Date: Wed, 11 Jun 2025 10:22:17 +0200
Subject: [PATCH] signer: allow passing nil keyLocator to DeriveSharedKey

Previously if the `keyLocaltor` argument was unset `DeriveSharedKey`
would crash.
---
 signer_client.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/signer_client.go b/signer_client.go
index acadd2d..32919b8 100644
--- a/signer_client.go
+++ b/signer_client.go
@@ -533,10 +533,13 @@ func (s *signerClient) DeriveSharedKey(ctx context.Context,
 
 	rpcIn := &signrpc.SharedKeyRequest{
 		EphemeralPubkey: ephemeralPubKey.SerializeCompressed(),
-		KeyLoc: &signrpc.KeyLocator{
+	}
+
+	if keyLocator != nil {
+		rpcIn.KeyLoc = &signrpc.KeyLocator{
 			KeyFamily: int32(keyLocator.Family),
 			KeyIndex:  int32(keyLocator.Index),
-		},
+		}
 	}
 
 	rpcCtx = s.signerMac.WithMacaroonAuth(rpcCtx)