github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-08 23:18:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

CLI: fixing account import ux bugs (#13328)

Browse Source 
* fixing account import checking wallet twice, and adding sub folder search with a depth of 2

* removing uneeded check

* fixing unit test

* adding reset cache to fix potential flake

* improving test based on feedback
This commit is contained in:
james-prysm
2023-12-13 11:11:32 -06:00
committed by GitHub
parent 52b9b65adb
commit 4cbe144a6c
12 changed files with 240 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
validator/keymanager/local/keymanager.go
View File

@@ -323,6 +323,13 @@ func CreateAccountsKeystoreRepresentation(
}, nil
}
// CreateEmptyKeyStoreRepresentationForNewWallet creates a placeholder accounts keystore for a new Prysm Local Wallet.
func CreateEmptyKeyStoreRepresentationForNewWallet(ctx context.Context, walletPassword string) (*AccountsKeystoreRepresentation, error) {
// make sure everything is clean when creating this.
ResetCaches()
return CreateAccountsKeystoreRepresentation(ctx, &accountStore{}, walletPassword)
}
// CreateOrUpdateInMemoryAccountsStore will set or update the local accounts store and update the local cache.
// This function DOES NOT save the accounts store to disk.
func (km *Keymanager) CreateOrUpdateInMemoryAccountsStore(_ context.Context, privateKeys, publicKeys [][]byte) error {
@@ -425,13 +432,10 @@ func (km *Keymanager) ListKeymanagerAccounts(ctx context.Context, cfg keymanager
func CreatePrintoutOfKeys(keys [][]byte) string {
var keysStr string
for i, k := range keys {
if i == 0 {
keysStr += fmt.Sprintf("%#x", bytesutil.Trunc(k))
} else if i == len(keys)-1 {
keysStr += fmt.Sprintf("%#x", bytesutil.Trunc(k))
} else {
keysStr += fmt.Sprintf(",%#x", bytesutil.Trunc(k))
if i != 0 {
keysStr += "," // Add a comma before each key except the first one
}
keysStr += fmt.Sprintf("%#x", bytesutil.Trunc(k))
}
return keysStr
}