SargonOS v1 integration API

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sargon"
-version = "1.1.2"
+version = "1.1.3"
 edition = "2021"
 build = "build.rs"
 

apple/Sources/Sargon/Drivers/HostInfo/HostInfoDriver+DeviceInfo.swift

@@ -28,7 +28,7 @@ import UIKit
 extension AppleHostInfoDriver: HostInfoDriver {
 
 	public func hostOs() async -> HostOs {
-        await .ios(version: UIDevice.current.systemVersion)
+		await HostOs.ios(version: UIDevice.current.systemVersion)
 	}
 
 	nonisolated public func hostDeviceName() async -> String {

apple/Sources/Sargon/Drivers/ProfileChange/ProfileChange.swift

@@ -0,0 +1,17 @@
+import SargonUniFFI
+
+public typealias ProfileChangeEventPublisher = EventPublisher<Profile>
+
+extension ProfileChangeEventPublisher: ProfileChangeDriver {
+    public static let shared = ProfileChangeEventPublisher()
+
+    public func handleProfileChange(changedProfile: Profile) async {
+        subject.send(changedProfile)
+    }
+}
+
+extension ProfileChangeDriver where Self == ProfileChangeEventPublisher {
+    public static var shared: Self {
+        ProfileChangeEventPublisher.shared
+    }
+}

apple/Sources/Sargon/Extensions/Swiftified/System/Drivers/Drivers+Swiftified.swift

@@ -55,7 +55,8 @@ extension Drivers {
 			logging: .shared,
 			eventBus: .shared,
 			fileSystem: .shared,
-			unsafeStorage: unsafeStorage
+			unsafeStorage: unsafeStorage,
+            profileChangeDriver: .shared
 		)
 	}
 }

apple/Sources/Sargon/Extensions/Swiftified/System/SargonOS+Swiftified.swift

@@ -12,11 +12,3 @@ import SargonUniFFI
 public typealias SargonOS = SargonOs
 
 extension SargonOS: @unchecked Sendable {}
-
-extension SargonOS {
-
-	@available(*, deprecated, message: "SHOULD migrate to use more specialized methods on SargonOS instead, e.g. `createAndSaveNewAccount` - SargonOS should be the SOLE object to perform the mutation and persisting.")
-	public func saveChangedProfile(_ profile: Profile) async throws {
-		try await deprecatedSaveFfiChangedProfile(profile: profile)
-	}
-}

apple/Sources/Sargon/SargonOS/SargonOSProtocol.swift

@@ -29,12 +29,6 @@ extension SargonOSProtocol {
 
 // MARK: Extensions
 extension SargonOSProtocol {
-
-	@available(*, deprecated, message: "SHOULD migrate to use more specialized access methods on SargonOS instead, e.g. `accountsOnCurrentNetwork`.")
-	public var profile: Profile {
-		os.profile()
-	}
-
 	public var currentNetworkID: NetworkID {
 		os.currentNetworkId()
 	}

apple/Sources/Sargon/Util/EventPublisher.swift

@@ -0,0 +1,15 @@
+import AsyncExtensions
+
+public final actor EventPublisher<Element: Sendable> {
+    public typealias Subject = AsyncPassthroughSubject<Element>
+    public typealias Stream = AsyncThrowingPassthroughSubject<Element, any Error>
+
+    let stream = Stream()
+    let subject = Subject()
+
+    public func eventStream() -> AsyncMulticastSequence<Subject, Stream> {
+        subject
+         .multicast(stream)
+         .autoconnect()
+    }
+}

apple/Tests/IntegrationTests/DriversTests/EventBusDriverTests.swift

@@ -54,7 +54,8 @@ extension Drivers {
 			logging: .shared,
 			eventBus: .shared,
 			fileSystem: .shared,
-			unsafeStorage: .shared
+			unsafeStorage: .shared,
+			profileChangeDriver: .shared
 		)
 	}
 
@@ -67,8 +68,9 @@ extension Drivers {
 			logging: .shared,
 			eventBus: .shared,
 			fileSystem: .shared,
-			unsafeStorage: .shared
-
+			unsafeStorage: .shared,
+			profileChangeDriver: .shared
+
 		)
 	}
 
@@ -81,7 +83,8 @@ extension Drivers {
 			logging: .shared,
 			eventBus: .shared,
 			fileSystem: .shared,
-			unsafeStorage: .shared
+			unsafeStorage: .shared,
+			profileChangeDriver: .shared
 		)
 	}
 
@@ -94,7 +97,8 @@ extension Drivers {
 			logging: .shared,
 			eventBus: .shared,
 			fileSystem: .shared,
-			unsafeStorage: .shared
+			unsafeStorage: .shared,
+			profileChangeDriver: .shared
 		)
 	}
 
@@ -107,7 +111,8 @@ extension Drivers {
 			logging: logging,
 			eventBus: .shared,
 			fileSystem: .shared,
-			unsafeStorage: .shared
+			unsafeStorage: .shared,
+			profileChangeDriver: .shared
 		)
 	}
 
@@ -120,7 +125,8 @@ extension Drivers {
 			logging: .shared,
 			eventBus: eventBus,
 			fileSystem: .shared,
-			unsafeStorage: .shared
+			unsafeStorage: .shared,
+			profileChangeDriver: .shared
 		)
 	}
 
@@ -133,7 +139,8 @@ extension Drivers {
 			logging: .shared,
 			eventBus: .shared,
 			fileSystem: fileSystem,
-			unsafeStorage: .shared
+			unsafeStorage: .shared,
+			profileChangeDriver: .shared
 		)
 	}
 
@@ -146,7 +153,8 @@ extension Drivers {
 			logging: .shared,
 			eventBus: .shared,
 			fileSystem: .shared,
-			unsafeStorage: unsafeStorage
+			unsafeStorage: unsafeStorage,
+			profileChangeDriver: .shared
 		)
 	}
 }

apple/Tests/IntegrationTests/DriversTests/InsecureStorageTests.swift

@@ -9,7 +9,7 @@ class InsecureStorageDriverTests: DriverTest<Insecure︕！TestOnly︕！Ephemer
     func test() async throws {
         let sut = SUT.init(keychainService: "test")
         let data = Data.sampleAced
-        let key = SUT.Key.activeProfileId
+        let key = SUT.Key.profileSnapshot
         try await sut.saveData(key: key, data: data)
         let loaded = try await sut.loadData(key: key)
         XCTAssertEqual(loaded, data)

apple/Tests/IntegrationTests/DriversTests/NetworkingDriverTests.swift

@@ -10,8 +10,8 @@ class NetworkingDriverTests: DriverTest<URLSession> {
 		let sut = SUT.shared as NetworkingDriver
 		let response = try await sut.executeNetworkRequest(
 			request: .init(
-				validating: "https://radixdlt.com",
-				method: .head
+				validating: "https://stokenet.radixdlt.com/",
+				method: .get
 			)
 		)
 		XCTAssertEqual(response.statusCode, 200)

apple/Tests/IntegrationTests/SargonOS/TestOSTests.swift

@@ -23,7 +23,8 @@ extension TestOS {
 						userDefaults: .init(
 							suiteName: UUID().uuidString
 						)!
-					)
+					),
+					profileChangeDriver: .shared
 				)
 			)
 		)
@@ -85,10 +86,10 @@ final class TestOSTests: OSTest {
 
 	func test_if_replace_profile_throws() async throws {
 		let sut = try await TestOS()
-		var profile = sut.profile
+		var profile = sut.os.profile()
 		profile.header.id = ProfileID() // mutate profile
 		do {
-			try await sut.os.saveChangedProfile(profile)
+			try await sut.os.setProfile(profile: profile)
 			XCTFail("We expected to throw")
 		} catch {
 			/* We expected to throw */
@@ -97,13 +98,13 @@ final class TestOSTests: OSTest {
 
 	func test_we_can_mutate_profile_in_swift_and_save_then_profile_is_updated() async throws {
 		let sut = try await TestOS()
-		var profile = sut.profile
+		var profile = sut.os.profile()
 		let creatingDevice = profile.header.creatingDevice
 		let newCreatingDevice = DeviceInfo.sampleOther
 		XCTAssertNotEqual(newCreatingDevice, creatingDevice)
 		profile.header.creatingDevice = newCreatingDevice // mutate profile
-		try await sut.os.saveChangedProfile(profile)
-		XCTAssertEqual(sut.profile.header.creatingDevice, newCreatingDevice) // assert change worked
+		try await sut.os.setProfile(profile: profile)
+		XCTAssertEqual(sut.os.profile().header.creatingDevice, newCreatingDevice) // assert change worked
 	}
 
 	func test_batch_create_many_accounts() async throws {

examples/android/build.gradle.kts

@@ -1,6 +1,8 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt)
+    alias(libs.plugins.ksp)
 }
 
 android {
@@ -38,6 +40,7 @@ android {
         jvmTarget = "1.8"
     }
     buildFeatures {
+        buildConfig = true
         compose = true
     }
     composeOptions {
@@ -56,6 +59,17 @@ dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
+    implementation(libs.okhttp)
+    implementation(libs.okhttp.logging.interceptor)
+    implementation(libs.hilt.android)
+    implementation(libs.androidx.datastore.preferences)
+    implementation(libs.androidx.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.viewmodel)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.datastore.preferences)
+    implementation(libs.androidx.datastore.preferences)
+    implementation(libs.androidx.activity)
+    ksp(libs.hilt.compiler)
 
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)

examples/android/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
+        android:name=".ExampleApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -17,9 +18,9 @@
             android:exported="true"
             android:label="@string/title_activity_main"
             android:theme="@style/Theme.SargonAndroid">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

examples/android/src/main/java/com/radixdlt/sargon/android/ExampleApplication.kt

@@ -0,0 +1,7 @@
+package com.radixdlt.sargon.android
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class ExampleApplication: Application()