Feat/tss sq rust #18

ieow · 2023-10-18T09:19:44Z

No description provided.

add input_share delete_question add check at set_question

remove unused param

to threshold_key class

…yQuestion

fix tests

fix multipart form data

due to 'type' backward compatible

Fixes minimum package support. Rebuilds libraries with mac support included.

metalurgical · 2023-10-18T17:21:27Z

Sources/ThresholdKey/Common/helper.swift

+func selectedServerToPointer (selectedServers: [UInt32]?) throws -> UnsafeMutablePointer<Int8>? {
+    guard let selectedServers = selectedServers else {
+        return nil
+    }
+    var serversPointer: UnsafeMutablePointer<Int8>?
+
+    let selected_servers_json = try JSONSerialization.data(withJSONObject: selectedServers as Any)
+    let selected_servers_str = String(data: selected_servers_json, encoding: .utf8)!
+    print(selected_servers_str)
+    serversPointer = UnsafeMutablePointer<Int8>(mutating: (selected_servers_str as NSString).utf8String)
+
+    guard let serversPointer = serversPointer else {
+        throw RuntimeError("convert error")
+    }
+    return serversPointer
+}
+
+func authSignaturesToPointer ( authSignatures : [String]?) throws -> UnsafeMutablePointer<Int8>? {
+    guard let authSignatures = authSignatures else {
+        return nil
+    }
+    let auth_signatures_json = try JSONSerialization.data(withJSONObject: authSignatures)
+    guard let auth_signatures_str = String(data: auth_signatures_json, encoding: .utf8) else {
+        throw RuntimeError("auth signatures error")
+    }
+    print(authSignatures)
+    print(auth_signatures_str.count)
+
+    let authSignaturesPointer = UnsafeMutablePointer<Int8>(mutating: (auth_signatures_str as NSString).utf8String)
+
+
+    return authSignaturesPointer
+}


These pointers are probably not valid once the function returns, the memory locations they're assigned are local to this function.

Suggested change

func selectedServerToPointer (selectedServers: [UInt32]?) throws -> UnsafeMutablePointer<Int8>? {

guard let selectedServers = selectedServers else {

return nil

}

var serversPointer: UnsafeMutablePointer<Int8>?

let selected_servers_json = try JSONSerialization.data(withJSONObject: selectedServers as Any)

let selected_servers_str = String(data: selected_servers_json, encoding: .utf8)!

print(selected_servers_str)

serversPointer = UnsafeMutablePointer<Int8>(mutating: (selected_servers_str as NSString).utf8String)

guard let serversPointer = serversPointer else {

throw RuntimeError("convert error")

}

return serversPointer

}

func authSignaturesToPointer ( authSignatures : [String]?) throws -> UnsafeMutablePointer<Int8>? {

guard let authSignatures = authSignatures else {

return nil

}

let auth_signatures_json = try JSONSerialization.data(withJSONObject: authSignatures)

guard let auth_signatures_str = String(data: auth_signatures_json, encoding: .utf8) else {

throw RuntimeError("auth signatures error")

}

print(authSignatures)

print(auth_signatures_str.count)

let authSignaturesPointer = UnsafeMutablePointer<Int8>(mutating: (auth_signatures_str as NSString).utf8String)

return authSignaturesPointer

}

metalurgical · 2023-10-18T17:22:36Z

Sources/ThresholdKey/Modules/TssModule.swift

+//
+//        // TODO : Fix the deserialization of the Factor cloud metadata
+//        // ts implemetation break this
+//        let deviceShareJson : [String: Any]
+//        if resultJson["deviceShare"] != nil {
+//            guard var deviceShare = resultJson["deviceShare"] as? [String: Any] else {
+//                throw "invalid factor json without deviceShare or share indexkey"
+//            }
+//            deviceShareJson = deviceShare
+//        } else {
+//            guard let deviceShare = resultJson["share"] as? [String:Any] else {
+//                throw "invalid factor json without deviceShare or share indexkey"
+//            }
+//            deviceShareJson = deviceShare
+//        }
+//
+//        guard let shareJson = deviceShareJson["share"] as? [String: Any] else {
+//            throw "Invalid factor key"
+//        }
+//        guard let shareIndex = shareJson["shareIndex"] as? String else {
+//            throw "Invalid factor key"
+//        }
+//        return shareIndex


Remove commented code

Suggested change

//

// // TODO : Fix the deserialization of the Factor cloud metadata

// // ts implemetation break this

// let deviceShareJson : [String: Any]

// if resultJson["deviceShare"] != nil {

// guard var deviceShare = resultJson["deviceShare"] as? [String: Any] else {

// throw "invalid factor json without deviceShare or share indexkey"

// }

// deviceShareJson = deviceShare

// } else {

// guard let deviceShare = resultJson["share"] as? [String:Any] else {

// throw "invalid factor json without deviceShare or share indexkey"

// }

// deviceShareJson = deviceShare

// }

//

// guard let shareJson = deviceShareJson["share"] as? [String: Any] else {

// throw "Invalid factor key"

// }

// guard let shareIndex = shareJson["shareIndex"] as? String else {

// throw "Invalid factor key"

// }

// return shareIndex

metalurgical · 2023-10-18T17:22:47Z

Sources/ThresholdKey/Modules/TssSecurityQuestionModule.swift

+
+    public func toString() throws -> String {
+        let data = try JSONEncoder().encode(self)
+//        let data = try JSONSerialization.data(withJSONObject: self)


Suggested change

// let data = try JSONSerialization.data(withJSONObject: self)

metalurgical · 2023-10-18T17:23:19Z

Sources/ThresholdKey/ThresholdKey.swift

+//    private func patch_input_factor_key(factorKey: String, completion: @escaping (Result<Void, Error>) -> Void) {
+//        tkeyQueue.async {
+//            do {
+//                var errorCode: Int32 = -1
+//                let cFactorKey = UnsafeMutablePointer<Int8>(mutating: (factorKey as NSString).utf8String)
+//                let curvePointer = UnsafeMutablePointer<Int8>(mutating: (self.curveN as NSString).utf8String)
+//
+//                withUnsafeMutablePointer(to: &errorCode, { error in
+//                    threshold_key_patch_input_factor_key(self.pointer, cFactorKey, curvePointer, error)
+//                })
+//                guard errorCode == 0 else {
+//                    throw RuntimeError("Error in ThresholdKey input_factor_key \(errorCode)")
+//                }
+//                completion(.success(()))
+//            } catch {
+//                completion(.failure(error))
+//            }
+//        }
+//    }
+
+    /// Patch and Inserts a `ShareStore` into `ThresholdKey` using `FactorKey`, useful for insertion before reconstruction to ensure the number of shares meet the minimum threshold.
+    ///
+    /// - Parameters:
+    ///   - factorKey  : The `factorKey` to be inserted
+    ///
+    /// - Throws: `RuntimeError`, indicates invalid parameters or invalid `ThresholdKey`.
+//    public func patch_input_factor_key(factorKey: String) async throws {
+//        return try await withCheckedThrowingContinuation {
+//            continuation in
+//            self.patch_input_factor_key(factorKey: factorKey) {
+//                result in
+//                switch result {
+//                case let .success(result):
+//                    continuation.resume(returning: result)
+//                case let .failure(error):
+//                    continuation.resume(throwing: error)
+//                }
+//            }
+//        }
+//    }


Suggested change

// private func patch_input_factor_key(factorKey: String, completion: @escaping (Result<Void, Error>) -> Void) {

// tkeyQueue.async {

// do {

// var errorCode: Int32 = -1

// let cFactorKey = UnsafeMutablePointer<Int8>(mutating: (factorKey as NSString).utf8String)

// let curvePointer = UnsafeMutablePointer<Int8>(mutating: (self.curveN as NSString).utf8String)

//

// withUnsafeMutablePointer(to: &errorCode, { error in

// threshold_key_patch_input_factor_key(self.pointer, cFactorKey, curvePointer, error)

// })

// guard errorCode == 0 else {

// throw RuntimeError("Error in ThresholdKey input_factor_key \(errorCode)")

// }

// completion(.success(()))

// } catch {

// completion(.failure(error))

// }

// }

// }

/// Patch and Inserts a `ShareStore` into `ThresholdKey` using `FactorKey`, useful for insertion before reconstruction to ensure the number of shares meet the minimum threshold.

///

/// - Parameters:

/// - factorKey : The `factorKey` to be inserted

///

/// - Throws: `RuntimeError`, indicates invalid parameters or invalid `ThresholdKey`.

// public func patch_input_factor_key(factorKey: String) async throws {

// return try await withCheckedThrowingContinuation {

// continuation in

// self.patch_input_factor_key(factorKey: factorKey) {

// result in

// switch result {

// case let .success(result):

// continuation.resume(returning: result)

// case let .failure(error):

// continuation.resume(throwing: error)

// }

// }

// }

// }

metalurgical · 2023-10-18T17:24:40Z

Sources/ThresholdKey/ThresholdKey.swift

+        guard errorCode == 0 else {
+            throw RuntimeError("Error in ThresholdKey get_domain_store_item")
+        }
+        let string = String(cString: result!)


This is unused.

Suggested change

let string = String(cString: result!)

metalurgical · 2023-10-18T17:28:16Z

Sources/ThresholdKey/Modules/TssSecurityQuestionModule.swift

+
+
+
+        let auth_signatures_json = try JSONSerialization.data(withJSONObject: threshold.authSignatures)


Should do a guard on threshold.authSignatures to resolve the warning here. Same for the places.

metalurgical · 2023-10-18T17:29:33Z

Sources/ThresholdKey/Modules/TssSecurityQuestionModule.swift

+        guard errorCode == 0 else {
+            throw RuntimeError("Error in ThresholdKey recover_factor \(errorCode)")
+        }
+        let hashOut = String(cString: result!)


This is unused. Why not use result instead of having to call compute_hash?

Suggested change

let hashOut = String(cString: result!)

metalurgical · 2023-10-18T17:30:31Z

Tests/tkeypkgTests/modules/tkey_pkgTssSecurityQuestionModuleTests.swift

+        threshold.setTorusUtils(torusUtils: torusUtils)
+//        threshold.init
+        print( try threshold.get_key_details().pub_key.getPublicKey(format: .EllipticCompress))
+        let factorKey = "36c1728c47c84dfe855949fa76daf82f8bda801af9374f30aa4c91b7fd7a8e3b"


This is unused.

Suggested change

let factorKey = "36c1728c47c84dfe855949fa76daf82f8bda801af9374f30aa4c91b7fd7a8e3b"

metalurgical · 2023-10-18T17:30:47Z

Tests/tkeypkgTests/modules/tkey_pkgTssSecurityQuestionModuleTests.swift

+        print( try threshold.get_key_details().pub_key.getPublicKey(format: .EllipticCompress))
+        let factorKey = "36c1728c47c84dfe855949fa76daf82f8bda801af9374f30aa4c91b7fd7a8e3b"
+        let answer = "jsanswer"
+        let question = "js question"


This is unused.

Suggested change

let question = "js question"

metalurgical · 2023-10-18T17:31:23Z

Tests/tkeypkgTests/modules/tkey_pkgTssSecurityQuestionModuleTests.swift

+        print(factor)
+
+        try await threshold.input_factor_key(factorKey: factor)
+        try await threshold.reconstruct()


Suggested change

try await threshold.reconstruct()

let _ = try await threshold.reconstruct()

ieow and others added 19 commits August 30, 2023 13:22

feat: tss security question

ec4b442

fix: test

9ea5517

fix: set_store_domain bug

05eb479

add input_share delete_question add check at set_question

fix: add test for delete question

97af06f

feat: update with factorPub

515c59f

Merge branch 'alpha' into feat/tssSecurityQuestion

8640242

feat: update sq using encryption

69ad165

fix: docs

1a3ff7d

remove unused param

fix: use hash as privatekey

b373222

feat: move signatures, torusUtils, nodeDetails

eacaa85

to threshold_key class

Merge branch 'feat/move-signatures-to-threshold' into feat/tssSecurit…

e5855d2

…yQuestion

fix: use hash as factorkey

302ff15

fix tests

fix: ts compatible + security-question recover

435e59e

fix multipart form data

fix: support encType

726ff6d

fix: authmetadata signature verify

355d8a4

due to 'type' backward compatible

feat: add patch input factor key

57c20a5

fix: update tss sq using rust

04de860

fix: tests

b9ee04e

fix: minimum package support

6878d09

Fixes minimum package support. Rebuilds libraries with mac support included.

metalurgical reviewed Oct 18, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/tss sq rust #18

Feat/tss sq rust #18

ieow commented Oct 18, 2023

metalurgical Oct 18, 2023

metalurgical Oct 18, 2023

metalurgical Oct 18, 2023

metalurgical Oct 18, 2023

metalurgical Oct 18, 2023

metalurgical Oct 18, 2023 •

edited

Loading

metalurgical Oct 18, 2023 •

edited

Loading

metalurgical Oct 18, 2023

metalurgical Oct 18, 2023

metalurgical Oct 18, 2023




		let auth_signatures_json = try JSONSerialization.data(withJSONObject: threshold.authSignatures)

	try await threshold.reconstruct()
	let _ = try await threshold.reconstruct()

Feat/tss sq rust #18

Are you sure you want to change the base?

Feat/tss sq rust #18

Conversation

ieow commented Oct 18, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

metalurgical Oct 18, 2023 • edited Loading

Choose a reason for hiding this comment

metalurgical Oct 18, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

metalurgical Oct 18, 2023 •

edited

Loading

metalurgical Oct 18, 2023 •

edited

Loading