Added Schnorr (#28)

* Updating submodule

* Added schnorr

Author: csjones

Package.swift

@@ -26,9 +26,12 @@ let package = Package(
                 "secp256k1/src/bench_ecmult.c",
                 "secp256k1/src/bench_internal.c",
                 "secp256k1/src/bench_recover.c",
+                "secp256k1/src/bench_schnorrsig.c",
                 "secp256k1/src/bench_sign.c",
                 "secp256k1/src/bench_verify.c",
                 "secp256k1/src/gen_context.c",
+                "secp256k1/src/modules/extrakeys/tests_impl.h",
+                "secp256k1/src/modules/schnorrsig/tests_impl.h",
                 "secp256k1/src/tests_exhaustive.c",
                 "secp256k1/src/tests.c",
                 "secp256k1/src/valgrind_ctime_test.c"
@@ -37,12 +40,16 @@ let package = Package(
                 .headerSearchPath("secp256k1"),
                 // Basic config values that are universal and require no dependencies.
                 // https://github.com/bitcoin-core/secp256k1/blob/master/src/basic-config.h#L27-L31
+                .define("ECMULT_WINDOW_SIZE", to: "15", nil),
+                .define("ECMULT_GEN_PREC_BITS", to: "4", nil),
+                .define("SECP256K1_EXTRAKEYS_H"),
+                .define("SECP256K1_SCHNORRSIG_H"),
+                .define("_SECP256K1_MODULE_EXTRAKEYS_MAIN_"),
+                .define("_SECP256K1_MODULE_SCHNORRSIG_MAIN_"),
                 .define("USE_NUM_NONE"),
                 .define("USE_FIELD_INV_BUILTIN"),
                 .define("USE_SCALAR_INV_BUILTIN"),
-                .define("USE_WIDEMUL_64"),
-                .define("ECMULT_WINDOW_SIZE", to: "15", nil),
-                .define("ECMULT_GEN_PREC_BITS", to: "4", nil)
+                .define("USE_WIDEMUL_64")
             ]
         ),
         // Only include select utility extensions because most of Swift Crypto is not required
@@ -54,8 +61,7 @@ let package = Package(
             ],
             sources: [
                 "swift-crypto/Tests/CryptoTests/Utils/BytesUtil.swift",
-                "extensions/Array.swift",
-                "extensions/Data.swift"
+                "extensions/String.swift"
             ]
         ),
         .testTarget(
@@ -66,6 +72,6 @@ let package = Package(
             ]
         )
     ],
-    swiftLanguageVersions: [.v4, .v5],
+    swiftLanguageVersions: [.v5],
     cLanguageStandard: .c89
 )

README.md

@@ -12,7 +12,11 @@ In your `Package.swift`:
 
 ```swift
 dependencies: [
-    .package(name: "secp256k1", url: "https://github.com/GigaBitcoin/secp256k1.swift.git", from: "0.0.14"),
+    .package(
+        name: "secp256k1",
+        url: "https://github.com/GigaBitcoin/secp256k1.swift.git",
+        from: "0.1.0"
+    ),
 ]
 ```
 
@@ -31,7 +35,7 @@ let context = secp256k1_context_create(UInt32(SECP256K1_CONTEXT_SIGN | SECP256K1
 var pubkeyLen = 33
 var cPubkey = secp256k1_pubkey()
 var pubkey = [UInt8](repeating: 0, count: pubkeyLen)
-let privkey = try! Array(hex: "14e4a74438858920d8a35fb2d88677580b6a2ee9be4e711ae34ec6b396d87b5c")
+let privkey = try! "14E4A74438858920D8A35FB2D88677580B6A2EE9BE4E711AE34EC6B396D87B5C".byteArray()
 
 // Verify the context and keys are setup correctly
 guard secp256k1_context_randomize(context, privkey) == 1,
@@ -42,7 +46,7 @@ guard secp256k1_context_randomize(context, privkey) == 1,
     return
 }
 
-print(pubkey.hex) //  02734b3511150a60fc8cac329cd5ff804555728740f2f2e98bc4242135ef5d5e4e
+print(String(byteArray: pubKey)) //  02734b3511150a60fc8cac329cd5ff804555728740f2f2e98bc4242135ef5d5e4e
 
 // Destory context after creation
 secp256k1_context_destroy(context)

Sources/secp256k1/include/secp256k1.h

@@ -1,4 +1,6 @@
 #include "../secp256k1/include/secp256k1_ecdh.h"
+#include "../secp256k1/include/secp256k1_extrakeys.h"
 #include "../secp256k1/include/secp256k1_preallocated.h"
 #include "../secp256k1/include/secp256k1_recovery.h"
+#include "../secp256k1/include/secp256k1_schnorrsig.h"
 #include "../secp256k1/include/secp256k1.h"

Sources/secp256k1/secp256k1

@@ -0,0 +1,28 @@
+//
+//  String.swift
+//  GigaBitcoin/secp256k1.swift
+//
+//  Copyright (c) 2020 GigaBitcoin LLC
+//  Distributed under the MIT software license
+//
+//  See the accompanying file LICENSE for information
+//
+
+import Foundation
+
+public extension String {
+    /// Public initializer backed by the `BytesUtil.swift` DataProtocol extension property `hexString`
+    /// - Parameter byteArray: byte array to initialize
+    init<T: DataProtocol>(byteArray: T) {
+        self.init()
+        self = byteArray.hexString
+    }
+
+    /// Public convenience function backed by the `BytesUtil.swift` Array extension initializer
+    /// - Throws: `ByteHexEncodingErrors` for invalid string or hex value
+    /// - Returns: initialized byte array
+    func byteArray() throws -> [UInt8] {
+        // The `BytesUtil.swift` Array extension expects lowercase strings
+        try Array(hexString: self.lowercased())
+    }
+}

Sources/swift-crypto/extensions/Array.swift

@@ -16,7 +16,7 @@ final class secp256k1Tests: XCTestCase {
         var cPubkey = secp256k1_pubkey()
         var publicKey = [UInt8](repeating: 0, count: pubkeyLen)
 
-        let privateKey = try! Array(hex: "14E4A74438858920D8A35FB2D88677580B6A2EE9BE4E711AE34EC6B396D87B5C")
+        let privateKey = try! "14E4A74438858920D8A35FB2D88677580B6A2EE9BE4E711AE34EC6B396D87B5C".byteArray()
 
         // Verify the context and keys are setup correctly
         XCTAssertEqual(secp256k1_context_randomize(context, privateKey), 1)
@@ -28,11 +28,11 @@ final class secp256k1Tests: XCTestCase {
         """
 
         // Define the expected public key
-        let expectedPublicKey = try! Array(hex: hexString)
+        let expectedPublicKey = try! hexString.byteArray()
 
         // Verify the generated public key matches the expected public key
         XCTAssertEqual(expectedPublicKey, publicKey)
-        XCTAssertEqual(hexString.lowercased(), publicKey.hex)
+        XCTAssertEqual(hexString.lowercased(), String(byteArray: publicKey))
     }
 
     /// Compressed Keypair test
@@ -48,15 +48,15 @@ final class secp256k1Tests: XCTestCase {
         var cPubkey = secp256k1_pubkey()
         var publicKey = [UInt8](repeating: 0, count: pubkeyLen)
 
-        let privateKey = try! Array(hex: "B035FCFC6ABF660856C5F3A6F9AC51FCA897BB4E76AD9ACA3EFD40DA6B9C864B")
+        let privateKey = try! "B035FCFC6ABF660856C5F3A6F9AC51FCA897BB4E76AD9ACA3EFD40DA6B9C864B".byteArray()
 
         // Verify the context and keys are setup correctly
         XCTAssertEqual(secp256k1_context_randomize(context, privateKey), 1)
         XCTAssertEqual(secp256k1_ec_pubkey_create(context, &cPubkey, privateKey), 1)
         XCTAssertEqual(secp256k1_ec_pubkey_serialize(context, &publicKey, &pubkeyLen, &cPubkey, UInt32(SECP256K1_EC_COMPRESSED)), 1)
 
         // Define the expected public key
-        let expectedPublicKey = try! Array(hex: "02EA724B70B48B61FB87E4310871A48C65BF38BF3FDFEFE73C2B90F8F32F9C1794")
+        let expectedPublicKey = try! "02EA724B70B48B61FB87E4310871A48C65BF38BF3FDFEFE73C2B90F8F32F9C1794".byteArray()
 
         // Verify the generated public key matches the expected public key
         XCTAssertEqual(expectedPublicKey, publicKey)