fix: correctly format signatures for rss

Author: metalurgical

Tests/tkeypkgTests/IntegrationTests.swift

@@ -1,9 +1,9 @@
 import CommonSources
 import FetchNodeDetails
 import Foundation
+@testable import tkey_mpc_swift
 import TorusUtils
 import XCTest
-@testable import tkey_mpc_swift
 
 final class integrationTests: XCTestCase {
     func test_TssModule() async throws {
@@ -21,11 +21,14 @@ final class integrationTests: XCTestCase {
         let idToken = try generateIdToken(email: TORUS_TEST_EMAIL)
         let verifierParams = VerifierParams(verifier_id: TORUS_TEST_EMAIL)
         let retrievedShare = try await torusUtils.retrieveShares(endpoints: nodeDetail.torusNodeEndpoints, torusNodePubs: nodeDetail.torusNodePub, indexes: nodeDetail.torusIndexes, verifier: TORUS_TEST_VERIFIER, verifierParams: verifierParams, idToken: idToken)
-        let signature = retrievedShare.sessionData?.sessionTokenData
-        let signatures = signature!.compactMap { item in
-            item?.signature
+
+        let signature_collection = retrievedShare.sessionData!.sessionTokenData.map { token in
+            ["data": Data(hex: token!.token).base64EncodedString(),
+             "sig": token!.signature]
         }
 
+        let sigs: [String] = try signature_collection.map { String(decoding: try JSONSerialization.data(withJSONObject: $0), as: UTF8.self) }
+
         let postbox_key = try! PrivateKey.generate()
         let storage_layer = try! StorageLayer(enable_logging: true, host_url: "https://metadata.tor.us", server_time_offset: 2)
         let service_provider = try! ServiceProvider(enable_logging: true, postbox_key: postbox_key.hex, useTss: true, verifier: TORUS_TEST_VERIFIER, verifierId: TORUS_TEST_EMAIL, nodeDetails: nodeDetail)
@@ -47,7 +50,7 @@ final class integrationTests: XCTestCase {
         let factorKey = try PrivateKey.generate()
         let factorPub = try factorKey.toPublic()
         try TssModule.backup_share_with_factor_key(threshold_key: threshold, shareIndex: shareIndex.hex, factorKey: factorKey.hex)
-        
+
         try await TssModule.create_tagged_tss_share(threshold_key: threshold, tss_tag: tssTag, deviceTssShare: nil, factorPub: factorPub, deviceTssIndex: 2, nodeDetails: nodeDetail, torusUtils: torusUtils)
 
         let (tss_index, tss_share) = try await TssModule.get_tss_share(threshold_key: threshold, tss_tag: tssTag, factorKey: factorKey.hex)
@@ -57,7 +60,7 @@ final class integrationTests: XCTestCase {
         let newFactorKey = try PrivateKey.generate()
         let newFactorPub = try newFactorKey.toPublic()
         // 2/2 -> 2/3 tss
-        try await TssModule.generate_tss_share(threshold_key: threshold, tss_tag: tssTag, input_tss_share: tss_share, tss_input_index: Int32(tss_index)!, auth_signatures: signatures, new_factor_pub: newFactorPub, new_tss_index: 3, nodeDetails: nodeDetail, torusUtils: torusUtils)
+        try await TssModule.generate_tss_share(threshold_key: threshold, tss_tag: tssTag, input_tss_share: tss_share, tss_input_index: Int32(tss_index)!, auth_signatures: sigs, new_factor_pub: newFactorPub, new_tss_index: 3, nodeDetails: nodeDetail, torusUtils: torusUtils)
         let (tss_index3, tss_share3) = try await TssModule.get_tss_share(threshold_key: threshold, tss_tag: tssTag, factorKey: newFactorKey.hex)
 
         let (_, tss_share_updated) = try await TssModule.get_tss_share(threshold_key: threshold, tss_tag: tssTag, factorKey: factorKey.hex)
@@ -74,7 +77,7 @@ final class integrationTests: XCTestCase {
             manual_sync: false
         )
         _ = try! await threshold2.initialize()
-        
+
         try await threshold2.input_factor_key(factorKey: factorKey.hex)
         _ = try! await threshold2.reconstruct()
 
@@ -91,7 +94,7 @@ final class integrationTests: XCTestCase {
         XCTAssertEqual(tss_index3, tss_index2_3)
 
         // 2/3 -> 2/2 tss
-        try await TssModule.delete_tss_share(threshold_key: threshold, tss_tag: tssTag, input_tss_share: tss_share3, tss_input_index: Int32(tss_index3)!, auth_signatures: signatures, delete_factor_pub: newFactorPub, nodeDetails: nodeDetail, torusUtils: torusUtils)
+        try await TssModule.delete_tss_share(threshold_key: threshold, tss_tag: tssTag, input_tss_share: tss_share3, tss_input_index: Int32(tss_index3)!, auth_signatures: sigs, delete_factor_pub: newFactorPub, nodeDetails: nodeDetail, torusUtils: torusUtils)
         // XCTAssertThrowsError( try await TssModule.get_tss_share(threshold_key: threshold, tss_tag: tssTag, factorKey: newFactorKey.hex) )
 
         let (tss_index_updated2, tss_share_updated2) = try await TssModule.get_tss_share(threshold_key: threshold, tss_tag: tssTag, factorKey: factorKey.hex)
@@ -101,10 +104,10 @@ final class integrationTests: XCTestCase {
         XCTAssertNotEqual(tss_share_updated, tss_share_updated2)
 
         // 2/2 -> 2/3 tss
-        try await TssModule.add_factor_pub(threshold_key: threshold, tss_tag: tssTag, factor_key: factorKey.hex, auth_signatures: signatures, new_factor_pub: newFactorPub, new_tss_index: 3, nodeDetails: nodeDetail, torusUtils: torusUtils)
+        try await TssModule.add_factor_pub(threshold_key: threshold, tss_tag: tssTag, factor_key: factorKey.hex, auth_signatures: sigs, new_factor_pub: newFactorPub, new_tss_index: 3, nodeDetails: nodeDetail, torusUtils: torusUtils)
 
         // 2/3 -> 2/2 tss
-        try await TssModule.delete_factor_pub(threshold_key: threshold, tss_tag: tssTag, factor_key: factorKey.hex, auth_signatures: signatures, delete_factor_pub: newFactorPub, nodeDetails: nodeDetail, torusUtils: torusUtils)
+        try await TssModule.delete_factor_pub(threshold_key: threshold, tss_tag: tssTag, factor_key: factorKey.hex, auth_signatures: sigs, delete_factor_pub: newFactorPub, nodeDetails: nodeDetail, torusUtils: torusUtils)
     }
 
     func test_TssModule_multi_tag() async throws {
@@ -125,12 +128,14 @@ final class integrationTests: XCTestCase {
         let idToken = try generateIdToken(email: TORUS_TEST_EMAIL)
         let verifierParams = VerifierParams(verifier_id: TORUS_TEST_EMAIL)
         let retrievedShare = try await torusUtils.retrieveShares(endpoints: nodeDetail.torusNodeSSSEndpoints, torusNodePubs: nodeDetail.torusNodePub, indexes: nodeDetail.torusIndexes, verifier: TORUS_TEST_VERIFIER, verifierParams: verifierParams, idToken: idToken)
-        print(retrievedShare)
-        let signature = retrievedShare.sessionData!.sessionTokenData
-        let signatures = signature.compactMap { item in
-            item?.signature
+
+        let signature_collection = retrievedShare.sessionData!.sessionTokenData.map { token in
+            ["data": Data(hex: token!.token).base64EncodedString(),
+             "sig": token!.signature]
         }
 
+        let sigs: [String] = try signature_collection.map { String(decoding: try JSONSerialization.data(withJSONObject: $0), as: UTF8.self) }
+
         let postbox_key = try! PrivateKey.generate()
         let storage_layer = try! StorageLayer(enable_logging: true, host_url: "https://metadata.tor.us", server_time_offset: 2)
         let service_provider = try! ServiceProvider(enable_logging: true, postbox_key: postbox_key.hex, useTss: true, verifier: TORUS_TEST_VERIFIER, verifierId: TORUS_TEST_EMAIL, nodeDetails: nodeDetail)
@@ -191,7 +196,7 @@ final class integrationTests: XCTestCase {
 
             newFactorKeys.append(newFactorKey)
             newFactorPubs.append(newFactorPub)
-            try await TssModule.add_factor_pub(threshold_key: threshold, tss_tag: tag, factor_key: factorKeys[index].hex, auth_signatures: signatures, new_factor_pub: newFactorPub, new_tss_index: 3, nodeDetails: nodeDetail, torusUtils: torusUtils)
+            try await TssModule.add_factor_pub(threshold_key: threshold, tss_tag: tag, factor_key: factorKeys[index].hex, auth_signatures: sigs, new_factor_pub: newFactorPub, new_tss_index: 3, nodeDetails: nodeDetail, torusUtils: torusUtils)
 
             try await threshold.sync_local_metadata_transistions()
 
@@ -258,7 +263,7 @@ final class integrationTests: XCTestCase {
 
             newFactorKeys2.append(newFactorKey2)
             newFactorPubs2.append(newFactorPub2)
-            try await TssModule.delete_factor_pub(threshold_key: threshold, tss_tag: tag, factor_key: newFactorKeys[index].hex, auth_signatures: signatures, delete_factor_pub: newFactorPubs[index], nodeDetails: nodeDetail, torusUtils: torusUtils)
+            try await TssModule.delete_factor_pub(threshold_key: threshold, tss_tag: tag, factor_key: newFactorKeys[index].hex, auth_signatures: sigs, delete_factor_pub: newFactorPubs[index], nodeDetails: nodeDetail, torusUtils: torusUtils)
         }
         try await threshold.sync_local_metadata_transistions()
         print(try threshold.get_all_tss_tags())