mirror of
https://github.com/OffchainLabs/prysm.git
synced 2026-01-08 23:18:15 -05:00
Update BLST And Herumi (#7632)
* fix build from source * clean up * update again * change everything * workaround for now * fix versioning * all passing now * fix build issues * clean up * revert use of MulVerify * gaz * stub * Apply suggestions from code review Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com> * fix all * fix test * todo * fix stub * revert back * make deep source happy * Update shared/bls/herumi/public_key.go * Update shared/bls/blst/signature.go * Update shared/bls/blst/signature_test.go * imports * move iface to common, export errors * rm iface build Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com> Co-authored-by: terence tsao <terence@prysmaticlabs.com>
This commit is contained in:
@@ -31,7 +31,8 @@ func createGenesisDepositData(t *testing.T) ([]*GenesisValidator, []*ethpb.Depos
|
||||
pubKeys := make([]bls.PublicKey, numKeys)
|
||||
privKeys := make([]bls.SecretKey, numKeys)
|
||||
for i := 0; i < numKeys; i++ {
|
||||
randKey := bls.RandKey()
|
||||
randKey, err := bls.RandKey()
|
||||
require.NoError(t, err)
|
||||
privKeys[i] = randKey
|
||||
pubKeys[i] = randKey.PublicKey()
|
||||
}
|
||||
|
||||
@@ -51,7 +51,8 @@ func createRandomKeystore(t testing.TB, password string) (*keymanager.Keystore,
|
||||
encryptor := keystorev4.New()
|
||||
id, err := uuid.NewRandom()
|
||||
require.NoError(t, err)
|
||||
validatingKey := bls.RandKey()
|
||||
validatingKey, err := bls.RandKey()
|
||||
require.NoError(t, err)
|
||||
pubKey := validatingKey.PublicKey().Marshal()
|
||||
cryptoFields, err := encryptor.Encrypt(validatingKey.Marshal(), password)
|
||||
require.NoError(t, err)
|
||||
@@ -118,7 +119,8 @@ func TestEncrypt(t *testing.T) {
|
||||
keystoresDir := setupRandomDir(t)
|
||||
password := "secretPassw0rd$1999"
|
||||
keystoreFilePath := filepath.Join(keystoresDir, "keystore.json")
|
||||
privKey := bls.RandKey()
|
||||
privKey, err := bls.RandKey()
|
||||
require.NoError(t, err)
|
||||
|
||||
cliCtx := setupCliContext(t, &cliConfig{
|
||||
outputPath: keystoreFilePath,
|
||||
|
||||
@@ -46,7 +46,12 @@ func main() {
|
||||
|
||||
var ctnr *keygen.UnencryptedKeysContainer
|
||||
if *random {
|
||||
ctnr = generateRandomKeys(*numKeys)
|
||||
ctnr, err = generateRandomKeys(*numKeys)
|
||||
if err != nil {
|
||||
// log.Fatal will prevent defer from being called
|
||||
cleanup()
|
||||
log.Fatal(err)
|
||||
}
|
||||
} else {
|
||||
ctnr = generateUnencryptedKeys(*startIndex)
|
||||
}
|
||||
@@ -57,20 +62,23 @@ func main() {
|
||||
}
|
||||
}
|
||||
|
||||
func generateRandomKeys(num int) *keygen.UnencryptedKeysContainer {
|
||||
func generateRandomKeys(num int) (*keygen.UnencryptedKeysContainer, error) {
|
||||
ctnr := &keygen.UnencryptedKeysContainer{
|
||||
Keys: make([]*keygen.UnencryptedKeys, num),
|
||||
}
|
||||
|
||||
for i := 0; i < num; i++ {
|
||||
sk := bls.RandKey()
|
||||
sk, err := bls.RandKey()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
ctnr.Keys[i] = &keygen.UnencryptedKeys{
|
||||
ValidatorKey: sk.Marshal(),
|
||||
WithdrawalKey: sk.Marshal(),
|
||||
}
|
||||
}
|
||||
|
||||
return ctnr
|
||||
return ctnr, nil
|
||||
}
|
||||
|
||||
func generateUnencryptedKeys(startIndex uint64) *keygen.UnencryptedKeysContainer {
|
||||
|
||||
Reference in New Issue
Block a user