Feat/cleanup

Package.resolved

@@ -41,7 +41,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/torusresearch/fetch-node-details-swift.git",
       "state" : {
-        "revision" : "c8d0121fed49ce761f5946bc30e1aafbe1ac5acb",
+        "revision" : "22bfadf7491d77a0bc1953af002cadbd61383e7d",
         "version" : "6.0.2"
       }
     },
@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/vapor/jwt-kit.git",
       "state" : {
-        "revision" : "c2595b9ad7f512d7f334830b4df1fed6e917946a",
-        "version" : "4.13.4"
+        "revision" : "484cb741f041dae2ba756e0400fb7f79707bde44",
+        "version" : "4.0.0"
       }
     },
     {
@@ -113,17 +113,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-crypto.git",
       "state" : {
-        "revision" : "bc1c29221f6dfeb0ebbfbc98eb95cd3d4967868e",
-        "version" : "3.4.0"
+        "revision" : "ddb07e896a2a8af79512543b1c7eb9797f8898a5",
+        "version" : "1.1.7"
       }
     },
     {
       "identity" : "tkey-mpc-swift",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/tkey/tkey-mpc-swift",
       "state" : {
-        "revision" : "8fe0cc8d5cc2ad5d38bf068bc29f6af7e3146d08",
-        "version" : "3.0.0"
+        "branch" : "fix/base64",
+        "revision" : "5e5bc3ea3dc01fb8921793a0adbf43511d9eb78a"
       }
     },
     {

Package.swift

@@ -14,8 +14,8 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/vapor/jwt-kit.git", from: "4.0.0"),
-        .package(url: "https://github.com/torusresearch/tss-client-swift.git", from: "4.0.0"),
-        .package(url: "https://github.com/tkey/tkey-mpc-swift", from: "3.0.0"),
+        .package(url: "https://github.com/torusresearch/tss-client-swift.git", exact: "4.0.0"),
+        .package(url: "https://github.com/tkey/tkey-mpc-swift", branch: "fix/base64"),
         .package(url: "https://github.com/torusresearch/customauth-swift-sdk", from: "10.0.1"),
         .package(url: "https://github.com/Web3Auth/single-factor-auth-swift", from: "5.0.0")
     ],

Sources/mpc-core-kit-swift/CoreKitStorage.swift

@@ -18,18 +18,6 @@ public class CoreKitStorage {
         self.storeKey = storeKey
     }
 
-//    static func getInstance( storeKey: String , storage: ILocalStorage? = nil) throws -> CoreKitStorage {
-//        guard let localInstance = self.instance else {
-//            guard let lStorage = storage else {
-//                throw "no storage provided or found"
-//            }
-//            let local = CoreKitStorage.init(storeKey: storeKey, storage: lStorage)
-//            CoreKitStorage.instance = local
-//            return local
-//        }
-//        return localInstance
-//    }
-
     public func resetStore() async throws -> Data {
         let result = try await self.storage.get(key: self.storeKey)
         let payload = try JSONSerialization.data(withJSONObject: [:])

Sources/mpc-core-kit-swift/Helper.swift

@@ -9,11 +9,13 @@ import Foundation
 import tssClientSwift
 import tkey
 import BigInt
-import curveSecp256k1
 import FetchNodeDetails
 
 import SingleFactorAuth
 
+#if canImport(curveSecp256k1)
+import curveSecp256k1
+#endif
 
 func convertPublicKeyFormat ( publicKey: String, outFormat: PublicKeyEncoding ) throws -> String {
     let point = try KeyPoint(address: publicKey)

Sources/mpc-core-kit-swift/Interface.swift

@@ -66,7 +66,7 @@ public struct MpcKeyDetails : Codable {
     public let requiredFactors: Int32
     public let threshold: UInt32
     public let shareDescriptions : String
-    public let total_shares: UInt32
+    public let totalShares: UInt32
     public let totalFactors: UInt32?
 //    public let requiredFactors: String
 }

Sources/mpc-core-kit-swift/mpcCoreKitSwift.swift → Sources/mpc-core-kit-swift/MpcCoreKitSwift.swift

@@ -13,9 +13,9 @@ import TorusUtils
 import FetchNodeDetails
 import SingleFactorAuth
 
-
-
+#if canImport(curveSecp256k1)
 import curveSecp256k1
+#endif
 
 public struct MpcCoreKit  {
 
@@ -164,7 +164,7 @@ public struct MpcCoreKit  {
             requiredFactors: finalKeyDetails.required_shares,
             threshold: finalKeyDetails.threshold,
             shareDescriptions: finalKeyDetails.share_descriptions,
-            total_shares: finalKeyDetails.total_shares,
+            totalShares: finalKeyDetails.total_shares,
             totalFactors: UInt32(factorsCount) + 1
         )
         return keyDetails
@@ -255,7 +255,7 @@ public struct MpcCoreKit  {
         let finalKeyDetails = try thresholdKey.get_key_details()
         let tssTag = try TssModule.get_tss_tag(threshold_key: thresholdKey)
         let tssPubKey = try? await TssModule.get_tss_pub_key(threshold_key: thresholdKey, tss_tag: tssTag)
-                return .init(tssPubKey: tssPubKey ?? "", metadataPubKey: try finalKeyDetails.pub_key.getPublicKey(format: .EllipticCompress), requiredFactors: finalKeyDetails.required_shares, threshold: finalKeyDetails.threshold, shareDescriptions: finalKeyDetails.share_descriptions, total_shares: finalKeyDetails.total_shares, totalFactors: 0)
+        return .init(tssPubKey: tssPubKey ?? "", metadataPubKey: try finalKeyDetails.pub_key.getPublicKey(format: .EllipticCompress), requiredFactors: finalKeyDetails.required_shares, threshold: finalKeyDetails.threshold, shareDescriptions: finalKeyDetails.share_descriptions, totalShares: finalKeyDetails.total_shares, totalFactors: 0)
     }
 
     private mutating func existingUser() async throws {

Sources/mpc-core-kit-swift/tss.swift → Sources/mpc-core-kit-swift/Tss.swift

@@ -10,7 +10,10 @@ import CustomAuth
 import TorusUtils
 import tssClientSwift
 import tkey
+#if canImport(curveSecp256k1)
 import curveSecp256k1
+#endif
+
 import BigInt
 import UIKit
 

Tests/mpc-kit-swiftTests/mpc_kit_swiftTests.swift

@@ -110,13 +110,17 @@ final class mpc_kit_swiftTests: XCTestCase {
         // Defining Test Cases and Test Methods
         // https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods
 
-        let email = "testiosEmail004"
+//        let email = "testiosEmail004"
+        let email = "testios002"
         let verifier = "torus-test-health"
         let clientId = "torus-test-health"
-        try await resetMPC(email: email, verifier: verifier, clientId: clientId)
+//        try await resetMPC(email: email, verifier: verifier, clientId: clientId)
 
         let memoryStorage = MemoryStorage()
         var coreKitInstance = MpcCoreKit( web3AuthClientId: clientId, web3AuthNetwork: Web3AuthNetwork.SAPPHIRE_DEVNET, disableHashFactor: false, localStorage: memoryStorage)
+        let factormetadata = try await coreKitInstance.tkey?.storage_layer_get_metadata(private_key: "a9d1bb9cdea502426ed24e8a1df8f956979942028dff957c4588aeded32daec9")
+
+        print(factormetadata)
 
         let data = try  mockLogin2(email: email)
         let token = data
@@ -132,7 +136,13 @@ final class mpc_kit_swiftTests: XCTestCase {
 //        let keyDetails = try await coreKitInstance.login(loginProvider: .jwt, verifier: "test", jwtParams: jwtParams.toDictionary())
 
 
-        let keyDetails = try await coreKitInstance.loginWithJwt(verifier: verifier, verifierId: email, idToken: token)
+        let keyDetails = try? await coreKitInstance.loginWithJwt(verifier: verifier, verifierId: email, idToken: token)
+        print(keyDetails)
+        print(try coreKitInstance.getHashKey())
+//        try await coreKitInstance.inputFactor(factorKey: "2d2c2c68bd80044ef943e3d0769556da97f13594a251201a480c091651098a0e")
+        let factormetadata1 = try await coreKitInstance.tkey?.storage_layer_get_metadata(private_key: "877d46727a09fcaf90d9b269f2ade70b713da9fe7fe6d781b419b3a9dc50e247")
+
+        print(factormetadata1)
 
         let hash = try keccak256(data: Data(hex: "010203040506"))
         let signatures = try await coreKitInstance.tssSign(message: hash)