accounts/external: fill account-cache if that hasn't already been done,

fixes ethereum#20995 (ethereum#20998)
enriquefynn · Feb 15, 2021 · 3fcf487 · 3fcf487
1 parent 8ac3b25
commit 3fcf487
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/accounts/external/backend.go b/accounts/external/backend.go
@@ -131,6 +131,12 @@ func (api *ExternalSigner) Accounts() []accounts.Account {
 func (api *ExternalSigner) Contains(account accounts.Account) bool {
 	api.cacheMu.RLock()
 	defer api.cacheMu.RUnlock()
+	if api.cache == nil {
+		// If we haven't already fetched the accounts, it's time to do so now
+		api.cacheMu.RUnlock()
+		api.Accounts()
+		api.cacheMu.RLock()
+	}
 	for _, a := range api.cache {
 		if a.Address == account.Address && (account.URL == (accounts.URL{}) || account.URL == api.URL()) {
 			return true