From 1b212fa1050c520c036efcde2b4c2d05d8b3c8b9 Mon Sep 17 00:00:00 2001
From: Slyghtning <hieblmi@protonmail.com>
Date: Fri, 10 Jul 2026 14:23:33 +0200
Subject: [PATCH] staticaddr/withdraw: send per-deposit address proofs

Include the derivation key for every withdrawal input in the server
request. This lets the server validate and sign withdrawals that combine
deposits from multiple derived addresses.
---
 staticaddr/withdraw/manager.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/staticaddr/withdraw/manager.go b/staticaddr/withdraw/manager.go
index 002ee25c..e113f794 100644
--- a/staticaddr/withdraw/manager.go
+++ b/staticaddr/withdraw/manager.go
@@ -561,6 +561,12 @@ func (m *Manager) CreateFinalizedWithdrawalTx(ctx context.Context,
 		return nil, nil, err
 	}
 
+	depositClientPubkeys, err := staticutil.DepositClientPubkeys(deposits)
+	if err != nil {
+		return nil, nil, fmt.Errorf("unable to prepare static address "+
+			"input proofs: %w", err)
+	}
+
 	withdrawalTx, unsignedPsbt, err := m.createWithdrawalTx(
 		ctx, outpoints, deposits, prevOuts,
 		btcutil.Amount(selectedWithdrawalAmount), withdrawalAddress,
@@ -579,8 +585,9 @@ func (m *Manager) CreateFinalizedWithdrawalTx(ctx context.Context,
 	// nolint:lll
 	sigResp, err := m.cfg.StaticAddressServerClient.ServerPsbtWithdrawDeposits(
 		ctx, &staticaddressrpc.ServerPsbtWithdrawRequest{
-			WithdrawalPsbt:  unsignedPsbt,
-			DepositToNonces: clientNonces,
+			WithdrawalPsbt:         unsignedPsbt,
+			DepositToNonces:        clientNonces,
+			DepositToClientPubkeys: depositClientPubkeys,
 		},
 	)
 	if err != nil {