fix: update and fix upgraded torusUtils

Author: ieow

Package.resolved

@@ -1,20 +1,20 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.5
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "CustomAuth",
     platforms: [
-        .iOS(.v13), .macOS(.v10_15)
+        .iOS(.v13), .macOS(.v11)
     ],
     products: [
         .library(
             name: "CustomAuth",
             targets: ["CustomAuth"])
     ],
     dependencies: [
-        .package(name: "TorusUtils", url: "https://github.com/torusresearch/torus-utils-swift.git", from: "6.0.1"),
+        .package(name: "TorusUtils", url: "https://github.com/torusresearch/torus-utils-swift.git", from: "7.0.0"),
         .package(name: "jwt-kit", url: "https://github.com/vapor/jwt-kit.git", from: "4.13.0"),
         .package(name: "JWTDecode", url: "https://github.com/auth0/JWTDecode.swift.git", from: "3.1.0")
     ],

Package.swift

@@ -3,6 +3,7 @@ import JWTDecode
 import TorusUtils
 import UIKit
 import XCTest
+import curveSecp256k1
 
 final class MockSDKTest: XCTestCase {
     func test_jwtDecodeTest() {
@@ -11,11 +12,11 @@ final class MockSDKTest: XCTestCase {
         print(decodedData)
     }
 
-    func testGetTorusKey() async {
+    func testGetTorusKey() async throws {
         let expectation = XCTestExpectation(description: "getTorusKey should correctly proxy input and output to/from TorusUtils")
 
-        let expectedPrivateKey = fakeData.generatePrivateKey()
-        let expectedPublicAddress = fakeData.generatePublicKey()
+        let expectedPrivateKey = try fakeData.generatePrivateKey()
+        let expectedPublicAddress = try fakeData.generatePublicKey()
         let expectedVerifier = fakeData.generateVerifier()
         let expectedVerfierId = fakeData.generateRandomEmail(of: 6)
 
@@ -48,11 +49,11 @@ final class MockSDKTest: XCTestCase {
         }
     }
 
-    func testGetAggregateTorusKey() async {
+    func testGetAggregateTorusKey() async throws {
         let expectation = XCTestExpectation(description: "getAggregateTorusKey should correctly proxy input and output to/from TorusUtils")
 
-        let expectedPrivateKey = fakeData.generatePrivateKey()
-        let expectedPublicAddress = fakeData.generatePublicKey()
+        let expectedPrivateKey = try fakeData.generatePrivateKey()
+        let expectedPublicAddress = try fakeData.generatePublicKey()
         let expectedVerifier = fakeData.generateVerifier()
         let expectedVerfierId = fakeData.generateRandomEmail(of: 6)
 
@@ -96,15 +97,14 @@ class fakeData {
         return String.randomString(length: 10)
     }
 
-    static func generatePrivateKey() -> String {
-        let privateKey = Data.randomOfLength(32)
-        return (privateKey?.toHexString())!
+    static func generatePrivateKey() throws -> String {
+        let privateKey = curveSecp256k1.SecretKey()
+        return try privateKey.serialize()
     }
 
-    static func generatePublicKey() -> String {
-        let privateKey = Data.randomOfLength(32)!
-        let publicKey = SECP256K1.privateToPublic(privateKey: privateKey)?.subdata(in: 1 ..< 65)
-        return publicKey!.toHexString()
+    static func generatePublicKey() throws -> String {
+        // drop "04"
+        return try String(curveSecp256k1.SecretKey().toPublic().serialize(compressed: false).dropFirst(2))
     }
 
     static func generateRandomEmail(of length: Int) -> String {

Tests/CustomAuthTests/CustomAuthTests.swift

@@ -39,7 +39,7 @@ public class StubMockTorusUtils: TorusUtils {
         return ret
     }
 
-    override open func generatePrivateKeyData() -> Data? {
+    open func generatePrivateKeyData() -> Data? {
         // empty bytes
 //        let ret = Data(count: 32)