From d3452a22cc871306c62de52d19295914141863c0 Mon Sep 17 00:00:00 2001
From: Martin HS <martin@swende.se>
Date: Wed, 20 Dec 2023 13:41:40 +0100
Subject: [PATCH] accounts: properly close managed wallets when closing manager
 (#28710)

---
 accounts/manager.go          | 3 +++
 accounts/usbwallet/wallet.go | 4 ++++
 cmd/clef/main.go             | 1 +
 3 files changed, 8 insertions(+)

diff --git a/accounts/manager.go b/accounts/manager.go
index a0b5c329c..cbe4f7c79 100644
--- a/accounts/manager.go
+++ b/accounts/manager.go
@@ -98,6 +98,9 @@ func NewManager(config *Config, backends ...Backend) *Manager {
 
 // Close terminates the account manager's internal notification processes.
 func (am *Manager) Close() error {
+	for _, w := range am.wallets {
+		w.Close()
+	}
 	errc := make(chan error)
 	am.quit <- errc
 	return <-errc
diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go
index 05add081a..69083dc89 100644
--- a/accounts/usbwallet/wallet.go
+++ b/accounts/usbwallet/wallet.go
@@ -483,6 +483,10 @@ func (w *wallet) Derive(path accounts.DerivationPath, pin bool) (accounts.Accoun
 	w.stateLock.Lock()
 	defer w.stateLock.Unlock()
 
+	if w.device == nil {
+		return accounts.Account{}, accounts.ErrWalletClosed
+	}
+
 	if _, ok := w.paths[address]; !ok {
 		w.accounts = append(w.accounts, account)
 		w.paths[address] = make(accounts.DerivationPath, len(path))
diff --git a/cmd/clef/main.go b/cmd/clef/main.go
index 234699136..f9b00e4a1 100644
--- a/cmd/clef/main.go
+++ b/cmd/clef/main.go
@@ -704,6 +704,7 @@ func signer(c *cli.Context) error {
 	log.Info("Starting signer", "chainid", chainId, "keystore", ksLoc,
 		"light-kdf", lightKdf, "advanced", advanced)
 	am := core.StartClefAccountManager(ksLoc, nousb, lightKdf, scpath)
+	defer am.Close()
 	apiImpl := core.NewSignerAPI(am, chainId, nousb, ui, db, advanced, pwStorage)
 
 	// Establish the bidirectional communication, by creating a new UI backend and registering