forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-19 13:21:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

accounts/usbwallet: fix De Morgan error dropping stale wallets on refresh

Browse source 
The inner loop in refreshWallets drops cached wallets that sort before
the next enumerated device or that have failed. When this drop-while
logic was refactored into an early break, the condition was negated but
the boolean operator was left as ||, so the negation is incomplete.

The drop condition is:

    (URL.Cmp(url) < 0) || (failure != nil)

so the break (abort dropping) condition must be its De Morgan negation:

    (URL.Cmp(url) >= 0) && (failure == nil)

With ||, the loop breaks as soon as the front wallet is operational,
even when it sorts before the current device. The stale wallet is not
dropped in place, and neither the "wrap new wallet" nor the "keep
matching wallet" branch matches, so the still-present device is silently
skipped for that refresh cycle (no WalletArrived) and is only re-added
on a later refresh.

Switch the operator to && so the break condition correctly mirrors the
intended drop semantics.
This commit is contained in:
cuiweixie 2026-06-11 20:00:00 +08:00
parent 1f87331fbc
commit be254ccb19
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
accounts/usbwallet/hub.go
View file

@ -220,7 +220,7 @@ func (hub *Hub) refreshWallets() {
for len(hub.wallets) > 0 {
// Abort if we're past the current device and found an operational one
_, failure := hub.wallets[0].Status()
if hub.wallets[0].URL().Cmp(url) >= 0 || failure == nil {
if hub.wallets[0].URL().Cmp(url) >= 0 && failure == nil {
break
}
// Drop the stale and failed devices