Apply Shield Wallet Interaction Part 2

.cargo/config.toml

@@ -6,3 +6,6 @@ FIXTURES_TX = "fixtures/transaction"
 FIXTURES_VECTOR = "fixtures/vector"
 FIXTURES_MODELS = "fixtures/models"
 FIXTURES_MODELS_GW = "fixtures/models/gateway"
+FIXTURES_MODELS_INTERACTION = "fixtures/models/interaction"
+FIXTURES_MODELS_PROFILES = "fixtures/models/profile"
+FIXTURES_MODELS_PROFILE = "fixtures/models/profile_submodels"

apple/Sources/Sargon/Drivers/FileSystem/FileSystemDriver+Data+ContentsOf+URL.swift

@@ -2,7 +2,7 @@ import Foundation
 import SargonUniFFI
 
 // MARK: - FileManager + @unchecked Sendable
-extension FileManager: @unchecked Sendable {}
+extension FileManager: @unchecked @retroactive Sendable {}
 
 // Makes it possible to type `.shared` on an initalizer/func taking
 // `some FileSystemDriver` as parameter.

apple/Sources/Sargon/Drivers/UnsafeStorage/UnsafeStorageDriver+UserDefaults.swift

@@ -2,7 +2,7 @@ import Foundation
 import SargonUniFFI
 
 // MARK: - UserDefaults + @unchecked Sendable
-extension UserDefaults: @unchecked Sendable {}
+extension UserDefaults: @unchecked @retroactive Sendable {}
 
 // Makes it possible to type `.shared` on an initalizer/func taking
 // `some UnsafeStorageDriver` as parameter.

apple/Sources/Sargon/Extensions/Swiftified/Profile/MFA/SecurityShieldBuilder+Swifified.swift

@@ -4,8 +4,8 @@ extension SecurityShieldBuilder {
 	public typealias Factor = FactorSourceID
 
 	/// Confirmation Role
-	public var timePeriodUntilAutoConfirm: TimePeriod {
-		getTimePeriodUntilAutoConfirm()
+	public var timeUntilTimedConfirmationIsCallable: TimePeriod {
+		getTimeUntilTimedConfirmationIsCallable()
 	}
 
 	public var threshold: Threshold {

apple/Sources/Sargon/Protocols/EntityProtocol.swift

@@ -43,7 +43,6 @@ extension EntityBaseProtocol {
 		flags.contains(.hiddenByUser)
 	}
 
-	// TODO: MOVE TO SARGON
 	public var virtualHierarchicalDeterministicFactorInstances:
 		Set<HierarchicalDeterministicFactorInstance>
 	{
@@ -55,15 +54,13 @@ extension EntityBaseProtocol {
 		}
 	}
 
-	// TODO: MOVE TO SARGON
 	public var hasAuthenticationSigningKey: Bool {
 		switch securityState {
-		case let .unsecured(unsecuredEntityControl):
+		case .unsecured:
 			false
 		}
 	}
 
-	// TODO: MOVE TO SARGON
 	public var deviceFactorSourceID: FactorSourceIDFromHash? {
 		switch self.securityState {
 		case let .unsecured(control):

apple/Tests/IntegrationTests/SargonOS/TestOSTests.swift

@@ -113,6 +113,7 @@ final class TestOSTests: OSTest {
 		XCTAssertEqual(try sut.os.profile().header.creatingDevice, newCreatingDevice) // assert change worked
 	}
 
+	@available(*, deprecated)
 	func batch_create_many_accounts() async throws {
 		let sut = await TestOS()
 		try await sut.os.newWallet(shouldPreDeriveInstances: false)

apple/Tests/TestCases/Profile/Collection/AccountsTests.swift

@@ -18,6 +18,7 @@ final class AccountsTests: CollectionTest<Account> {
 	/// We can have this test implemented when swift-testing is stable to be used,
 	/// and we will use "exit tests" to test it:
 	/// https://forums.swift.org/t/exit-tests-death-tests-and-you/71186
+	@available(*, deprecated)
 	func omit_crash_if_duplicates() { // this test is relevant for Personas, AuthorizedDapps, ProfileNetworks etc etc... they all use the same rust type, which does not allow duplicates
 		var profile = Profile.sample
 		let a = Account.sample
@@ -27,12 +28,14 @@ final class AccountsTests: CollectionTest<Account> {
 		let _ = profile.jsonData() // should crash
 	}
 
+	@available(*, deprecated)
 	func test_json_decoding_of_profile_fails_if_accounts_contains_duplicates() throws {
 		var json = JSON(Profile.sample)
 		json["profileNetworks.accounts"] = [Account.sample, Account.sample]
 		XCTAssertThrowsError(try Profile(jsonData: json.rawData()))
 	}
 
+	@available(*, deprecated)
 	func test_json_decoding_of_profile_fails_if_accounts_contains_duplicated_ids() throws {
 		var json = JSON(Profile.sample)
 		let a = Account.sample

apple/Tests/TestCases/Profile/Collection/FactorSourcesTests.swift

@@ -18,24 +18,28 @@ final class FactorSourcesTests: CollectionTest<FactorSource> {
 	/// We can have this test implemented when swift-testing is stable to be used,
 	/// and we will use "exit tests" to test it:
 	/// https://forums.swift.org/t/exit-tests-death-tests-and-you/71186
+	@available(*, deprecated)
 	func omit_crash_if_empty() {
 		var profile = Profile.sample
 		profile.factorSources = [] // empty FactorSources is not allowed
 		let _ = profile.jsonData() // should crash
 	}
 
+	@available(*, deprecated)
 	func test_json_decoding_of_profile_fails_if_factorSources_is_empty() throws {
 		var json = JSON(Profile.sample)
 		json["factorSources"] = []
 		XCTAssertThrowsError(try Profile(jsonData: json.rawData()))
 	}
 
+	@available(*, deprecated)
 	func test_json_decoding_of_profile_fails_if_factorSources_contains_duplicates() throws {
 		var json = JSON(Profile.sample)
 		json["factorSources"] = [FactorSource.sample, FactorSource.sample]
 		XCTAssertThrowsError(try Profile(jsonData: json.rawData()))
 	}
 
+	@available(*, deprecated)
 	func test_json_decoding_of_profile_fails_if_factorSources_contains_duplicated_ids() throws {
 		var json = JSON(Profile.sample)
 		let a = FactorSource.sample

apple/Tests/TestCases/Profile/Factor/DeviceFactorSourceTests.swift

@@ -93,6 +93,7 @@ final class DeviceFactorSourceTests: SpecificFactorSourceTest<DeviceFactorSource
 		)
 	}
 
+	@available(*, deprecated)
 	func test_json_decoding_of_profile_fails_if_factorSource_supported_curves_is_empty() throws {
 		var json = JSON(Profile.sample)
 		json["factorSources"][0]["device.common.cryptoParameters.supportedCurves"] = []

apple/Tests/TestCases/Profile/MFA/SecurityShieldsBuilderTests.swift

@@ -26,9 +26,9 @@ struct ShieldTests {
 	@Test("days")
 	func days() {
 		var builder = SecurityShieldBuilder()
-		#expect(builder.timePeriodUntilAutoConfirm == TimePeriod(days: 14))
-		builder = builder.setTimePeriodUntilAutoConfirm(timePeriod: TimePeriod(days: 237))
-		#expect(builder.timePeriodUntilAutoConfirm == TimePeriod(days: 237))
+		#expect(builder.timeUntilTimedConfirmationIsCallable == TimePeriod(days: 14))
+		builder = builder.setTimeUntilDelayedConfirmationIsCallable(timePeriod: TimePeriod(days: 237))
+		#expect(builder.timeUntilTimedConfirmationIsCallable == TimePeriod(days: 237))
 	}
 
 	@Test("empty primary threshold")
@@ -58,7 +58,13 @@ struct ShieldTests {
 	@Test("primary override validation status trustedContact")
 	func primValidationStatusTrustedContact() {
 		let builder = SecurityShieldBuilder()
-		#expect(builder.validationForAdditionOfFactorSourceToPrimaryOverrideForEach(factorSources: [TrustedContactFactorSource.sample.asGeneral.id]).compactMap(\.reasonIfInvalid) == [FactorSourceValidationStatusReasonIfInvalid.nonBasic(SecurityShieldBuilderRuleViolation.PrimaryCannotContainTrustedContact)])
+		#expect(
+			builder.validationForAdditionOfFactorSourceToPrimaryOverrideForEach(factorSources: [
+				TrustedContactFactorSource.sample.asGeneral.id,
+			]).compactMap(\.reasonIfInvalid) == [
+				FactorSourceValidationStatusReasonIfInvalid.nonBasic(
+					SecurityShieldBuilderRuleViolation.PrimaryCannotContainTrustedContact),
+			])
 	}
 
 	@Test("Auto lowering of threshold upon deletion")
@@ -76,14 +82,18 @@ struct ShieldTests {
 
 		#expect(builder.threshold == Threshold.specific(3))
 
-		builder = builder.removeFactorFromPrimary(factorSourceId: x, factorListKind: FactorListKind.threshold)
+		builder = builder.removeFactorFromPrimary(
+			factorSourceId: x, factorListKind: FactorListKind.threshold
+		)
 		#expect(builder.threshold == Threshold.specific(2))
 
 		builder = builder.removeFactorFromAllRoles(factorSourceId: y)
 		#expect(builder.recoveryRoleFactors == []) // assert `y` is removed from Recovery and Primary
 		#expect(builder.threshold == Threshold.specific(1))
 
-		builder = builder.removeFactorFromPrimary(factorSourceId: z, factorListKind: FactorListKind.threshold)
+		builder = builder.removeFactorFromPrimary(
+			factorSourceId: z, factorListKind: FactorListKind.threshold
+		)
 		#expect(builder.threshold == Threshold.all)
 		#expect(builder.primaryRoleThresholdFactors == [])
 	}
@@ -115,9 +125,11 @@ struct ShieldTests {
 		#expect(builder.primaryRoleThresholdFactors == [factor])
 		#expect(builder.primaryRoleOverrideFactors == [other])
 
-		builder = builder.removeFactorFromPrimary(factorSourceId: factor, factorListKind: FactorListKind.threshold)
-			.addFactorSourceToPrimaryOverride(factorSourceId: factor)
-			.addFactorSourceToPrimaryThreshold(factorSourceId: other)
+		builder = builder.removeFactorFromPrimary(
+			factorSourceId: factor, factorListKind: FactorListKind.threshold
+		)
+		.addFactorSourceToPrimaryOverride(factorSourceId: factor)
+		.addFactorSourceToPrimaryThreshold(factorSourceId: other)
 		#expect(builder.primaryRoleThresholdFactors == [other])
 		#expect(builder.primaryRoleOverrideFactors == [other, factor])
 
@@ -130,7 +142,7 @@ struct ShieldTests {
 	func build() throws {
 		var builder = SecurityShieldBuilder()
 			.setName(name: "S.H.I.E.L.D.")
-			.setTimePeriodUntilAutoConfirm(timePeriod: TimePeriod(days: 42))
+			.setTimeUntilDelayedConfirmationIsCallable(timePeriod: TimePeriod(days: 42))
 			.setAuthenticationSigningFactor(new: .sampleDevice)
 
 		// Primary
@@ -145,7 +157,9 @@ struct ShieldTests {
 			// Confirmation
 			.addFactorSourceToConfirmationOverride(factorSourceId: .sampleDevice)
 			// Remove
-			.removeFactorFromPrimary(factorSourceId: .sampleArculusOther, factorListKind: FactorListKind.override)
+			.removeFactorFromPrimary(
+				factorSourceId: .sampleArculusOther, factorListKind: FactorListKind.override
+			)
 			.removeFactorFromRecovery(factorSourceId: .sampleLedgerOther)
 
 		builder = builder.setAuthenticationSigningFactor(new: .sampleDevice)
@@ -175,7 +189,11 @@ struct ShieldTests {
 		let builder = SecurityShieldBuilder()
 			.addFactorSourceToPrimaryThreshold(factorSourceId: .samplePassword)
 
-		#expect(builder.selectedPrimaryThresholdFactorsStatus() == .invalid(reason: SelectedPrimaryThresholdFactorsStatusInvalidReason.cannotBeUsedAlone(factorSourceKind: FactorSourceKind.password)))
+		#expect(
+			builder.selectedPrimaryThresholdFactorsStatus()
+				== .invalid(
+					reason: SelectedPrimaryThresholdFactorsStatusInvalidReason.cannotBeUsedAlone(
+						factorSourceKind: FactorSourceKind.password)))
 	}
 
 	@Test("selected primary threshold factors status")
@@ -209,12 +227,16 @@ extension FactorSourceID {
 	public static let samplePasswordOther = PasswordFactorSource.sampleOther.asGeneral.id
 
 	public static let sampleOffDeviceMnemonic = OffDeviceMnemonicFactorSource.sample.asGeneral.id
-	public static let sampleOffDeviceMnemonicOther = OffDeviceMnemonicFactorSource.sampleOther.asGeneral.id
+	public static let sampleOffDeviceMnemonicOther = OffDeviceMnemonicFactorSource.sampleOther
+		.asGeneral.id
 
 	public static let sampleTrustedContact = TrustedContactFactorSource.sample.asGeneral.id
-	public static let sampleTrustedContactOther = TrustedContactFactorSource.sampleOther.asGeneral.id
+	public static let sampleTrustedContactOther = TrustedContactFactorSource.sampleOther.asGeneral
+		.id
 
-	public static let sampleSecurityQuestions = SecurityQuestionsNotProductionReadyFactorSource.sample.asGeneral.id
-	public static let sampleSecurityQuestionsOther = SecurityQuestionsNotProductionReadyFactorSource.sampleOther.asGeneral.id
+	public static let sampleSecurityQuestions = SecurityQuestionsNotProductionReadyFactorSource
+		.sample.asGeneral.id
+	public static let sampleSecurityQuestionsOther = SecurityQuestionsNotProductionReadyFactorSource
+		.sampleOther.asGeneral.id
 }
 #endif

apple/Tests/TestCases/Profile/ProfileTests.swift

@@ -24,6 +24,7 @@ final class ProfileTests: Test<Profile> {
 		XCTAssertNoDifference(SUT.sample.id, SUT.sample.header.id)
 	}
 
+	@available(*, deprecated)
 	func test_encryption_roundtrip() throws {
 		let password = "ultra secret"
 		let sut = SUT.sample
@@ -102,6 +103,7 @@ final class ProfileTests: Test<Profile> {
 		XCTAssertTrue(jsonString.contains("version"))
 	}
 
+	@available(*, deprecated)
 	func test_json_roundtrip() throws {
 		func doTest(_ sut: SUT, _ json: String) throws {
 			let encoded = sut.toJSONString(prettyPrinted: false)
@@ -146,8 +148,9 @@ final class ProfileTests: Test<Profile> {
 		}
 	}
 
+	@available(*, deprecated)
 	func test_check_if_profile_json_contains_legacy_p2p_links_when_p2p_links_are_present() throws {
-		let json = try openFile(subPath: "vector", "only_plaintext_profile_snapshot_version_100", extension: "json")
+		let json = try jsonData(file: "only_plaintext_profile_snapshot_version_100")
 		XCTAssert(
 			SUT.checkIfProfileJsonContainsLegacyP2PLinks(contents: json)
 		)
@@ -159,15 +162,16 @@ final class ProfileTests: Test<Profile> {
 		)
 	}
 
+	@available(*, deprecated)
 	func test_check_if_encrypted_profile_json_contains_legacy_p2p_links_when_p2p_links_are_present() throws {
-		let json = try openFile(subPath: "vector", "profile_encrypted_by_password_of_babylon", extension: "json")
+		let json = try jsonData(file: "profile_encrypted_by_password_of_babylon")
 		XCTAssert(
 			SUT.checkIfEncryptedProfileJsonContainsLegacyP2PLinks(contents: json, password: "babylon")
 		)
 	}
 
 	func test_check_if_encrypted_profile_json_string_contains_legacy_p2p_links_when_p2p_links_are_present() throws {
-		let json = try openFile(subPath: "vector", "profile_encrypted_by_password_of_babylon", extension: "json")
+		let json = try jsonData(file: "profile_encrypted_by_password_of_babylon")
 		let jsonString = try XCTUnwrap(String(data: json, encoding: .utf8))
 		XCTAssert(
 			SUT.checkIfEncryptedProfileJsonStringContainsLegacyP2PLinks(jsonString: jsonString, password: "babylon")

apple/Tests/TestCases/RadixConnect/WalletInteraction/WalletToDappInteractionResponseTests.swift

@@ -6,10 +6,9 @@ import XCTest
 
 final class WalletToDappInteractionResponseTests: Test<WalletToDappInteractionResponse> {
 	func test_codable() throws {
-		let json = try openFile(
-			subPath: "vector",
-			"wallet_interactions_wallet_to_dapp",
-			extension: "json"
+		let json = try jsonData(
+			file: "wallet_interactions_wallet_to_dapp",
+			in: "models/interaction"
 		)
 		let sut = try JSONDecoder().decode([SUT].self, from: json)
 		let encoded = try JSONEncoder().encode(sut)

apple/Tests/Utils/Extensions/UUID+Literals.swift

@@ -1,14 +1,16 @@
 import Foundation
 
 // MARK: - UUID + ExpressibleByStringLiteral
-extension UUID: ExpressibleByStringLiteral {
+extension UUID: @retroactive ExpressibleByExtendedGraphemeClusterLiteral {}
+extension UUID: @retroactive ExpressibleByUnicodeScalarLiteral {}
+extension UUID: @retroactive ExpressibleByStringLiteral {
 	public init(stringLiteral value: String) {
 		self.init(uuidString: value)!
 	}
 }
 
 // MARK: - UUID + ExpressibleByIntegerLiteral
-extension UUID: ExpressibleByIntegerLiteral {
+extension UUID: @retroactive ExpressibleByIntegerLiteral {
 	public init(integerLiteral value: UInt8) {
 		self.init(uuidString: "00000000-0000-0000-0000-0000000000" + String(format: "%02d", value))!
 	}

apple/Tests/Utils/Test.swift

@@ -40,33 +40,43 @@ class TestCase: XCTestCase {
 	func jsonFixture<T: Decodable>(
 		as: T.Type = T.self,
 		file fileName: String,
+		in subPath: String? = nil,
 		decode: (Data) throws -> T = { try JSONDecoder().decode(T.self, from: $0) }
 	) throws -> (model: T, json: Data) {
-		let json = try openFile(subPath: "vector", fileName, extension: "json")
+		let json = try jsonData(file: fileName, in: subPath)
 		let model: T = try decode(json)
 		return (model, json)
 	}
 
 	func jsonFixture<T>(
 		as: T.Type = T.self,
 		file fileName: String,
+		in subPath: String? = nil,
 		decode: (Data) throws -> T
 	) throws -> (model: T, json: Data) {
-		let json = try openFile(subPath: "vector", fileName, extension: "json")
+		let json = try jsonData(file: fileName, in: subPath)
 		let model: T = try decode(json)
 		return (model, json)
 	}
 
+	func jsonData(
+		file fileName: String,
+		in subPath: String? = nil
+	) throws -> Data {
+		try openFile(
+			subPath: subPath ?? "models/profile",
+			fileName,
+			extension: "json"
+		)
+	}
+
 	func jsonString<T>(
 		as: T.Type = T.self,
 		file fileName: String,
+		in subPath: String? = nil,
 		decode: (String) throws -> T
 	) throws -> (model: T, jsonString: String) {
-		let jsonData = try openFile(
-			subPath: "vector",
-			fileName,
-			extension: "json"
-		)
+		let jsonData = try jsonData(file: fileName, in: subPath)
 		let jsonString = try XCTUnwrap(String(data: jsonData, encoding: .utf8))
 		let model: T = try decode(jsonString)
 		return (model, jsonString)