chore: replace secp256k1.swift for web3swift

secp256k1.swift library does not support Cocoapods anymore, which is
still being required as an alternative distribution by ImmutableXCore.

Bump Swift version to 5.7

.github/workflows/swiftformat.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: sinoru/actions-setup-swift@v2
         with:
-          swift-version: '5.6.1'
+          swift-version: '5.7'
       - name: GitHub Action for SwiftFormat
         uses: CassiusPacheco/[email protected]
         with:

.github/workflows/swiftlint.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: sinoru/actions-setup-swift@v2
         with:
-          swift-version: '5.6.1'
+          swift-version: '5.7'
       - name: GitHub Actions for SwiftLint with --strict
         uses: sinoru/actions-swiftlint@v6
         with:

.github/workflows/unit_tests.yml

@@ -11,8 +11,8 @@ jobs:
   unit_tests:
     runs-on: macos-12
     steps:
-    - name: Select Xcode 13.4.1
-      run: sudo xcode-select -s "/Applications/Xcode_13.4.1.app"
+    - name: Select Xcode 14.0.1
+      run: sudo xcode-select -s "/Applications/Xcode_14.0.1.app"
     - name: Repository checkout
       uses: actions/checkout@v2
     - name: Build for iOS

.swift-version

@@ -1 +1 @@
-5.5
+5.7

ImmutableXCore.podspec

@@ -22,7 +22,7 @@ Pod::Spec.new do |spec|
 
     spec.dependency 'AnyCodable-FlightSchool', '~> 0.6'
     spec.dependency 'BigInt', '~> 5.2.0'
-    spec.dependency 'secp256k1.swift', '~> 0.1'
+    spec.dependency 'secp256k1Swift', '~> 0.7.4'
 
     spec.resources = ['Sources/ImmutableXCore/version']
   end

Package.resolved

@@ -18,13 +18,22 @@
         "version" : "5.3.0"
       }
     },
+    {
+      "identity" : "secp256k1",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/portto/secp256k1.git",
+      "state" : {
+        "revision" : "6864a2560066cedede330c4b344689432a7300f7",
+        "version" : "0.0.5"
+      }
+    },
     {
       "identity" : "secp256k1.swift",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Boilertalk/secp256k1.swift",
+      "location" : "https://github.com/portto/secp256k1.swift.git",
       "state" : {
-        "revision" : "45e458ec3be46cf0a6eb68bc947f797852dc65d8",
-        "version" : "0.1.6"
+        "revision" : "23aa6bab1f60e513297d0d58a863418f68534e56",
+        "version" : "0.7.4"
       }
     }
   ],

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.5
+// swift-tools-version: 5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -18,15 +18,15 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/Flight-School/AnyCodable", from: "0.6.5"),
         .package(url: "https://github.com/attaswift/BigInt", from: "5.3.0"),
-        .package(url: "https://github.com/Boilertalk/secp256k1.swift.git", from: "0.1.6"),
+        .package(url: "https://github.com/portto/secp256k1.swift.git", from: "0.7.4"),
     ],
     targets: [
         .target(
             name: "ImmutableXCore",
             dependencies: [
                 .product(name: "BigInt", package: "BigInt"),
                 .product(name: "AnyCodable", package: "AnyCodable"),
-                .product(name: "secp256k1", package: "secp256k1.swift"),
+                .product(name: "secp256k1Swift", package: "secp256k1.swift"),
             ],
             resources: [
                 .copy("version"),

Sources/ImmutableXCore/Crypto/BIP32/BIP32Key.swift

@@ -1,7 +1,6 @@
 import BigInt
 import CryptoKit
 import Foundation
-import secp256k1
 
 struct BIP32Key {
     /// - Parameters:
@@ -32,7 +31,7 @@ struct BIP32Key {
                 data += UInt8(0).data
                 data += derivedPrivateKey
             } else {
-                data += Secp256k1Encrypter.createPublicKey(privateKey: derivedPrivateKey)
+                data += try Secp256k1Encrypter.createPublicKey(privateKey: derivedPrivateKey)
             }
 
             let derivingIndex = CFSwapInt32BigToHost(hardened ? (edge | index) : index)

Sources/ImmutableXCore/Crypto/Secp256k1/Secp256k1Encrypter.swift

@@ -1,5 +1,5 @@
 import Foundation
-import secp256k1
+import secp256k1Swift
 
 /// A simple wrapper of ``secp256k1`` lib for creating public keys.
 struct Secp256k1Encrypter {
@@ -9,21 +9,7 @@ struct Secp256k1Encrypter {
     ///   - privateKey: private key bytes
     ///   - compressed: whether public key should be compressed.
     /// - Returns: If compression enabled, public key is 33 bytes size, otherwise it is 65 bytes.
-    static func createPublicKey(privateKey: Data, compressed: Bool = true) -> Data {
-        let context: OpaquePointer = secp256k1_context_create(UInt32(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY))!
-        defer { secp256k1_context_destroy(context) }
-
-        let privateKey: [UInt8] = Array(privateKey)
-        var publicKey = secp256k1_pubkey()
-        _ = secp256k1_ec_pubkey_create(context, &publicKey, privateKey)
-
-        var output = Data(count: compressed ? 33 : 65)
-        var outputLen: Int = output.count
-        let compressedFlags = compressed ? UInt32(SECP256K1_EC_COMPRESSED) : UInt32(SECP256K1_EC_UNCOMPRESSED)
-        output.withUnsafeMutableBytes { pointer in
-            guard let p = pointer.bindMemory(to: UInt8.self).baseAddress else { return }
-            secp256k1_ec_pubkey_serialize(context, p, &outputLen, &publicKey, compressedFlags)
-        }
-        return output
+    static func createPublicKey(privateKey: Data, compressed: Bool = true) throws -> Data {
+        try secp256k1.Signing.PrivateKey(rawRepresentation: privateKey).publicKey.rawRepresentation
     }
 }