Upgrade libsecp256k1 to 0.6.0 (0cdc758a56360bf58a851fe91085a327ec97685a) (#44)

Author: Sajjon

README.md

@@ -5,6 +5,9 @@
 
 _K1_ is Swift wrapper around [libsecp256k1 (bitcoin-core/secp256k1)][lib], offering ECDSA, Schnorr ([BIP340][bip340]) and ECDH features.
 
+> [!NOTE]
+> Current `libsecp256k1` version is [0.6.0 (0cdc758a56360bf58a851fe91085a327ec97685a)](https://github.com/bitcoin-core/secp256k1/commit/0cdc758a56360bf58a851fe91085a327ec97685a)
+
 # Documentation
 Read full documentation [here on SwiftPackageIndex][doc].
 
@@ -246,15 +249,12 @@ assert(ab.count == 65) // pass
 
 # Development
 
-Stand in root and run
+Stand in root and run to setup submodules
 
 ```sh
-./scripts/bootstrap.sh
+make submodules
 ```
 
-To clone the dependency [libsecp256k1][lib], using commit [427bc3cdcfbc74778070494daab1ae5108c71368](https://github.com/bitcoin-core/secp256k1/commit/427bc3cdcfbc74778070494daab1ae5108c71368) (semver 0.3.0)
-
-
 ## `gyb`
 
 Some of the files in this project are autogenerated (metaprogramming) using the Swift Utils tools called [gyb](https://github.com/apple/swift/blob/main/utils/gyb.py) (_"generate your boilerplate"_). `gyb` is included in [`./scripts/gyb`](scripts/gyb).

Sources/K1/Support/FFI/API/ECDH/FFI+ECDH.swift

@@ -30,7 +30,7 @@ extension FFI.ECDH {
 		///
 		case noHashWholePoint
 
-		func hashfp() -> (Optional< @convention(c) (UnsafeMutablePointer<UInt8>?, UnsafePointer<UInt8>?, UnsafePointer<UInt8>?, UnsafeMutableRawPointer?) -> Int32>) {
+		func hashfp() -> ((@convention(c) (UnsafeMutablePointer<UInt8>?, UnsafePointer<UInt8>?, UnsafePointer<UInt8>?, UnsafeMutableRawPointer?) -> Int32)?) {
 			switch self {
 			case .libsecp256kDefault: return secp256k1_ecdh_hash_function_default
 			case .ansiX963: return ecdh_asn1_x963
@@ -59,7 +59,7 @@ extension FFI.ECDH {
 			repeating: 0,
 			count: hashFp.outputByteCount
 		)
-		var arbitraryData: [UInt8]? = {
+		let arbitraryData: [UInt8]? = {
 			switch hashFp {
 			case let .libsecp256kDefault(arbitraryData?): return [UInt8](arbitraryData)
 			case .libsecp256kDefault(.none): return nil
@@ -70,14 +70,27 @@ extension FFI.ECDH {
 		try FFI.call(
 			ifFailThrow: .ecdh
 		) { context in
-			secp256k1_ecdh(
-				context,
-				&sharedPublicPointBytes, // output
-				&publicKeyRaw, // pubkey
-				privateKey.secureBytes.backing.bytes, // seckey
-				hashFp.hashfp(), // hashfp
-				&arbitraryData // arbitrary data pointer that is passed through to hashfp
-			)
+			if var arbitraryData {
+				arbitraryData.withUnsafeMutableBytes { ptr in
+					secp256k1_ecdh(
+						context,
+						&sharedPublicPointBytes, // output
+						&publicKeyRaw, // pubkey
+						privateKey.secureBytes.backing.bytes, // seckey
+						hashFp.hashfp(), // hashfp
+						ptr.baseAddress // properly formed pointer
+					)
+				}
+			} else {
+				secp256k1_ecdh(
+					context,
+					&sharedPublicPointBytes,
+					&publicKeyRaw,
+					privateKey.secureBytes.backing.bytes,
+					hashFp.hashfp(),
+					nil // No arbitrary data
+				)
+			}
 		}
 
 		return Data(sharedPublicPointBytes)

Sources/secp256k1/libsecp256k1

@@ -121,7 +121,7 @@ struct RecoveryTestVector: Decodable, Equatable {
 }
 
 // MARK: - K1.ECDSAWithKeyRecovery.Signature.RecoveryID + ExpressibleByIntegerLiteral
-extension K1.ECDSAWithKeyRecovery.Signature.RecoveryID: ExpressibleByIntegerLiteral {
+extension K1.ECDSAWithKeyRecovery.Signature.RecoveryID: @retroactive ExpressibleByIntegerLiteral {
 	public init(integerLiteral value: UInt8) {
 		self.init(rawValue: value)!
 	}