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

Fix Pubkey Not Specified Issues in External Keystore Imports (#6914)

Browse Source 
* utilize pubkey from privkey if missing pubkey field in keystore
* change tool as well
* Merge refs/heads/master into strange-keystore
* Merge refs/heads/master into strange-keystore
This commit is contained in:
Raul Jordan
2020-08-06 16:56:25 -05:00
committed by GitHub
parent f0de09d2ad
commit 96fcb3a927
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/keystores/main.go
View File

@@ -242,13 +242,25 @@ func readAndDecryptKeystore(fullPath string, password string) error {
}
return err
}
publicKeyBytes, err := hex.DecodeString(keystoreFile.Pubkey)
if err != nil {
return errors.Wrapf(err, "could not parse public key for keystore at path: %s", fullPath)
var pubKeyBytes []byte
// Attempt to use the pubkey present in the keystore itself as a field. If unavailable,
// then utilize the public key directly from the private key.
if keystoreFile.Pubkey != "" {
pubKeyBytes, err = hex.DecodeString(keystoreFile.Pubkey)
if err != nil {
return errors.Wrap(err, "could not decode pubkey from keystore")
}
} else {
privKey, err := bls.SecretKeyFromBytes(privKeyBytes)
if err != nil {
return errors.Wrap(err, "could not initialize private key from bytes")
}
pubKeyBytes = privKey.PublicKey().Marshal()
}
fmt.Printf("\nDecrypted keystore %s\n", au.BrightMagenta(fullPath))
fmt.Printf("Privkey: %#x\n", au.BrightGreen(privKeyBytes))
fmt.Printf("Pubkey: %#x\n", au.BrightGreen(publicKeyBytes))
fmt.Printf("Pubkey: %#x\n", au.BrightGreen(pubKeyBytes))
return nil
}