tkey · metalurgical · Apr 24, 2024 · Apr 22, 2024 · Apr 22, 2024 · Apr 22, 2024
diff --git a/License.md b/License.md
@@ -0,0 +1,11 @@
+Copyright (c) 2020 Torus Labs Private Limited (https://tor.us)
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Package.swift b/Package.swift
@@ -11,15 +11,14 @@ let package = Package(
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
-            name: "tkey-mpc-swift",
-            targets: ["tkey-mpc-swift"]),
+            name: "tkey",
+            targets: ["tkey"]),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
-        .package(name: "TorusUtils", url: "https://github.com/torusresearch/torus-utils-swift" , from: "8.0.0"),
+        .package(name: "TorusUtils", url: "https://github.com/torusresearch/torus-utils-swift" , from: "8.0.3"),
         // dev dependencies only
-        .package(name:"CryptoSwift", url: "https://github.com/krzyzanowskim/CryptoSwift.git",from: "1.5.1"),
         .package(name:"jwt-kit", url: "https://github.com/vapor/jwt-kit.git", from: "4.0.0"),
     ],
     targets: [
@@ -28,18 +27,18 @@ let package = Package(
         .binaryTarget(name: "libtkey",
                       path: "Sources/libtkey/libtkey.xcframework"
         ),
-        .target(name: "tkey",
+        .target(name: "lib",
                dependencies: ["libtkey"],
                 path: "Sources/libtkey"
         ),
         .target(
-            name: "tkey-mpc-swift",
-            dependencies: ["tkey", "TorusUtils"],
+            name: "tkey",
+            dependencies: ["lib", "TorusUtils"],
             path: "Sources/ThresholdKey"
         ),
         .testTarget(
             name: "tkey-pkgTests",
-            dependencies: ["tkey-mpc-swift", "CryptoSwift", .product(name: "JWTKit", package: "jwt-kit")],
+            dependencies: ["tkey", .product(name: "JWTKit", package: "jwt-kit")],
             path: "Tests/tkeypkgTests"
         ),
     ]

diff --git a/Sources/ThresholdKey/Common/KeyPoint.swift b/Sources/ThresholdKey/Common/KeyPoint.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 

diff --git a/Sources/ThresholdKey/Common/NodeDetails.swift b/Sources/ThresholdKey/Common/NodeDetails.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class NodeDetails {

diff --git a/Sources/ThresholdKey/Common/PrivateKey.swift b/Sources/ThresholdKey/Common/PrivateKey.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class PrivateKey {

diff --git a/Sources/ThresholdKey/Common/ShareStore.swift b/Sources/ThresholdKey/Common/ShareStore.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class ShareStore {

diff --git a/Sources/ThresholdKey/Common/TssOptions.swift b/Sources/ThresholdKey/Common/TssOptions.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class TssOptions {

diff --git a/Sources/ThresholdKey/GenerateShareStoreResult.swift b/Sources/ThresholdKey/GenerateShareStoreResult.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class GenerateShareStoreResult {

diff --git a/Sources/ThresholdKey/KeyDetails.swift b/Sources/ThresholdKey/KeyDetails.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class KeyDetails {

diff --git a/Sources/ThresholdKey/KeyPointArray.swift b/Sources/ThresholdKey/KeyPointArray.swift
@@ -1,7 +1,7 @@
 import Foundation
 
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public class KeyPointArray {

diff --git a/Sources/ThresholdKey/KeyReconstructionDetails.swift b/Sources/ThresholdKey/KeyReconstructionDetails.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class KeyReconstructionDetails: Codable {

diff --git a/Sources/ThresholdKey/LocalMetadataTransitions.swift b/Sources/ThresholdKey/LocalMetadataTransitions.swift
@@ -1,7 +1,7 @@
 import Foundation
 
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class LocalMetadataTransitions {

diff --git a/Sources/ThresholdKey/Metadata.swift b/Sources/ThresholdKey/Metadata.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class Metadata {

diff --git a/Sources/ThresholdKey/Modules/PrivateKeysModule.swift b/Sources/ThresholdKey/Modules/PrivateKeysModule.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public struct KeyData: Decodable {

diff --git a/Sources/ThresholdKey/Modules/SecurityQuestionModule.swift b/Sources/ThresholdKey/Modules/SecurityQuestionModule.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class SecurityQuestionModule {

diff --git a/Sources/ThresholdKey/Modules/SeedPhraseModule.swift b/Sources/ThresholdKey/Modules/SeedPhraseModule.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public struct SeedPhrase: Codable {

diff --git a/Sources/ThresholdKey/Modules/ShareSerializationModule.swift b/Sources/ThresholdKey/Modules/ShareSerializationModule.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class ShareSerializationModule {

diff --git a/Sources/ThresholdKey/Modules/ShareTransferModule.swift b/Sources/ThresholdKey/Modules/ShareTransferModule.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class ShareTransferModule {

diff --git a/Sources/ThresholdKey/Modules/TssModule.swift b/Sources/ThresholdKey/Modules/TssModule.swift
@@ -1,10 +1,9 @@
 import Foundation
 
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
-import CommonSources
 import FetchNodeDetails
 import TorusUtils
 

diff --git a/Sources/ThresholdKey/Polynomial.swift b/Sources/ThresholdKey/Polynomial.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class Polynomial {

diff --git a/Sources/ThresholdKey/PublicPolynomial.swift b/Sources/ThresholdKey/PublicPolynomial.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class PublicPolynomial {

diff --git a/Sources/ThresholdKey/RssComm.swift b/Sources/ThresholdKey/RssComm.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class RssComm {

diff --git a/Sources/ThresholdKey/ServiceProvider.swift b/Sources/ThresholdKey/ServiceProvider.swift
@@ -1,10 +1,9 @@
 import Foundation
 import TorusUtils
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 import FetchNodeDetails
-import CommonSources
 
 public final class ServiceProvider {
     private(set) var pointer: OpaquePointer?

diff --git a/Sources/ThresholdKey/ShareMap.swift b/Sources/ThresholdKey/ShareMap.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class ShareMap {

diff --git a/Sources/ThresholdKey/ShareStoreArray.swift b/Sources/ThresholdKey/ShareStoreArray.swift
@@ -1,7 +1,7 @@
 import Foundation
 
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public class ShareStoreArray {

diff --git a/Sources/ThresholdKey/ShareStoreMap.swift b/Sources/ThresholdKey/ShareStoreMap.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class ShareStoreMap {

diff --git a/Sources/ThresholdKey/ShareStorePolyIdIndexMap.swift b/Sources/ThresholdKey/ShareStorePolyIdIndexMap.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class ShareStorePolyIdIndexMap {

diff --git a/Sources/ThresholdKey/ShareTransferStore.swift b/Sources/ThresholdKey/ShareTransferStore.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 public final class ShareTransferStore {

diff --git a/Sources/ThresholdKey/StorageLayer.swift b/Sources/ThresholdKey/StorageLayer.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 

diff --git a/Sources/ThresholdKey/ThresholdKey.swift b/Sources/ThresholdKey/ThresholdKey.swift
@@ -1,8 +1,8 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
-import CommonSources
+import FetchNodeDetails
 import TorusUtils
 
 public class ThresholdKey {

diff --git a/Sources/ThresholdKey/Version.swift b/Sources/ThresholdKey/Version.swift
@@ -1,6 +1,6 @@
 import Foundation
-#if canImport(tkey)
-    import tkey
+#if canImport(lib)
+    import lib
 #endif
 
 /// Returns the library version.

diff --git a/Tests/tkeypkgTests/IntegrationTests.swift b/Tests/tkeypkgTests/IntegrationTests.swift
@@ -1,7 +1,6 @@
-import CommonSources
 import FetchNodeDetails
 import Foundation
-@testable import tkey_mpc_swift
+@testable import tkey
 import TorusUtils
 import XCTest
 

diff --git a/Tests/tkeypkgTests/modules/tkey_pkgPrivateKeysModuleTests.swift b/Tests/tkeypkgTests/modules/tkey_pkgPrivateKeysModuleTests.swift
@@ -1,6 +1,6 @@
 import XCTest
 import Foundation
-@testable import tkey_mpc_swift
+@testable import tkey
 import Foundation
 
 final class tkey_pkgPrivateKeyModuleTests: XCTestCase {

diff --git a/Tests/tkeypkgTests/modules/tkey_pkgSecurityQuestionModuleTests.swift b/Tests/tkeypkgTests/modules/tkey_pkgSecurityQuestionModuleTests.swift
@@ -1,6 +1,6 @@
 import XCTest
 import Foundation
-@testable import tkey_mpc_swift
+@testable import tkey
 import Foundation
 
 final class tkey_pkgSecurityQuestionModuleTests: XCTestCase {

diff --git a/Tests/tkeypkgTests/modules/tkey_pkgSeedPhraseModuleTests.swift b/Tests/tkeypkgTests/modules/tkey_pkgSeedPhraseModuleTests.swift
@@ -1,6 +1,6 @@
 import XCTest
 import Foundation
-@testable import tkey_mpc_swift
+@testable import tkey
 import Foundation
 
 final class tkey_pkgSeedPhraseModuleTests: XCTestCase {

diff --git a/Tests/tkeypkgTests/modules/tkey_pkgShareSerializationModuleTests.swift b/Tests/tkeypkgTests/modules/tkey_pkgShareSerializationModuleTests.swift
@@ -1,6 +1,6 @@
 import XCTest
 import Foundation
-@testable import tkey_mpc_swift
+@testable import tkey
 import Foundation
 
 final class tkey_pkgShareSerializationModuleTests: XCTestCase {

diff --git a/Tests/tkeypkgTests/modules/tkey_pkgShareTransferModuleTests.swift b/Tests/tkeypkgTests/modules/tkey_pkgShareTransferModuleTests.swift
@@ -1,6 +1,6 @@
 import XCTest
 import Foundation
-@testable import tkey_mpc_swift
+@testable import tkey
 import Foundation
 
 final class tkey_pkgShareTransferModuleTests: XCTestCase {

diff --git a/Tests/tkeypkgTests/tkey_base.swift b/Tests/tkeypkgTests/tkey_base.swift
@@ -8,12 +8,12 @@
 import Foundation
 import XCTest
 import Foundation
-@testable import tkey_mpc_swift
+@testable import tkey
 import TorusUtils
 
 class tkey_baseTests: XCTestCase {
 
-    var torus = TorusUtils.init(clientId: "CLIENT ID")
+    var torus = TorusUtils.init(network: .sapphire(.SAPPHIRE_DEVNET), clientId: "CLIENT ID")
 
     override func setUp() async throws {
         let postbox_key = try! PrivateKey.generate()