From f7d3d8255270f1b9ffedf9779af882d617978621 Mon Sep 17 00:00:00 2001
From: charlie632 <charlie.caoa@gmail.com>
Date: Wed, 12 Jul 2023 22:30:36 -0600
Subject: [PATCH] feat: ensure valid randomness of PrivateKey

---
 Sources/zkp/secp256k1.swift | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/Sources/zkp/secp256k1.swift b/Sources/zkp/secp256k1.swift
index 5a8bb786..7ed33624 100644
--- a/Sources/zkp/secp256k1.swift
+++ b/Sources/zkp/secp256k1.swift
@@ -151,16 +151,14 @@ extension secp256k1 {
 
     /// Backing initialization that creates a random secp256k1 private key for signing
     @usableFromInline init(format: secp256k1.Format = .compressed) throws {
-        let privateKey = SecureBytes(count: secp256k1.ByteDetails.count)
-        self.keyParity = 0
-        self.format = format
-        self.privateBytes = privateKey
-        self.publicBytes = try PublicKeyImplementation.generate(bytes: &privateBytes, format: format)
-        self.xonlyBytes = try XonlyKeyImplementation.generate(
-            bytes: publicBytes,
-            keyParity: &keyParity,
-            format: format
-        )
+        for _ in 0 ..< 10 {
+            let randomBytes = SecureBytes(count: secp256k1.ByteDetails.count)
+            if let privateKey = try? PrivateKeyImplementation(dataRepresentation: Data(randomBytes), format: format) {
+                self = privateKey
+                return
+            }
+        }
+        fatalError("Looped more than 10 times trying to generate a key")
     }
 
     /// Backing initialization that creates a secp256k1 private key for signing from a data representation.