Introduce Sargon: Radix Engine Toolkit (RET) removed

RadixWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "3313f884630244f405efa4cdbbcb2486d097b16289931114ea3c6826384f24b9",
+  "originHash" : "5781e493b3b5935431690908af86b207cf3426348bd3a1d90bc542f5896251ea",
   "pins" : [
     {
       "identity" : "anycodable",
@@ -118,6 +118,15 @@
         "version" : "11.6.4"
       }
     },
+    {
+      "identity" : "sargon",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/radixdlt/sargon",
+      "state" : {
+        "revision" : "bfc6ca53983aa71d73f4c7009f95b7f475933634",
+        "version" : "0.6.17"
+      }
+    },
     {
       "identity" : "screenshotpreventing-ios",
       "kind" : "remoteSourceControl",
@@ -186,8 +195,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections.git",
       "state" : {
-        "branch" : "main",
-        "revision" : "b2c7faa198164f3d928b1ceec9ce373e22febb96"
+        "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb",
+        "version" : "1.1.0"
       }
     },
     {
@@ -244,15 +253,6 @@
         "revision" : "db33f4084304e2ef47c8b4d2949f0eb286f95b90"
       }
     },
-    {
-      "identity" : "swift-engine-toolkit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/radixdlt/swift-engine-toolkit",
-      "state" : {
-        "branch" : "1.0.12_update",
-        "revision" : "4cf2edc92a430d4f59547d405e4c2c4bc5c912fe"
-      }
-    },
     {
       "identity" : "swift-identified-collections",
       "kind" : "remoteSourceControl",

RadixWallet/Clients/AccountPortfoliosClient/AccountPortfoliosClient+Interface.swift

@@ -44,38 +44,34 @@ extension AccountPortfoliosClient {
 			@Dependency(\.cacheClient) var cacheClient
 
 			let changedAccounts: [Profile.Network.Account.EntityAddress]?
-			let resourceAddressesToRefresh: [Address]?
+			let poolAddressesToRefresh: [PoolAddress]?
 			do {
-				let manifest = intent.manifest()
+				let manifest = intent.manifest
 
 				let involvedAccounts = try await transactionClient.myInvolvedEntities(manifest)
 				changedAccounts = involvedAccounts.accountsDepositedInto
 					.union(involvedAccounts.accountsWithdrawnFrom)
 					.map(\.address)
 
-				let involvedAddresses = manifest.extractAddresses()
+				let involvedPoolAddresses = manifest.involvedPoolAddresses
 				/// Refresh the resources if an operation on resource pool is involved,
 				/// reason being that contributing or withdrawing from a resource pool modifies the totalSupply
-				if involvedAddresses.contains(where: \.key.isResourcePool) {
+				if !involvedPoolAddresses.isEmpty {
 					/// A little bit too aggressive, as any other resource will also be refreshed.
 					/// But at this stage we cannot determine(without making additional calls) the pool unit related fungible resource
-					resourceAddressesToRefresh = involvedAddresses
-						.filter { $0.key == .globalFungibleResourceManager || $0.key.isResourcePool }
-						.values
-						.flatMap(identity)
-						.compactMap { try? $0.asSpecific() }
+					poolAddressesToRefresh = involvedPoolAddresses
 				} else {
-					resourceAddressesToRefresh = nil
+					poolAddressesToRefresh = nil
 				}
 			} catch {
 				loggerGlobal.warning("Could get transactionClient.myInvolvedEntities: \(error.localizedDescription)")
 				changedAccounts = nil
-				resourceAddressesToRefresh = nil
+				poolAddressesToRefresh = nil
 			}
 
-			if let resourceAddressesToRefresh {
-				for item in resourceAddressesToRefresh {
-					cacheClient.removeFile(.onLedgerEntity(.resource(item.asGeneral)))
+			if let poolAddressesToRefresh {
+				for item in poolAddressesToRefresh {
+					cacheClient.removeFile(.onLedgerEntity(.address(.pool(item))))
 				}
 			}
 

RadixWallet/Clients/AccountPortfoliosClient/AccountPortfoliosClient+Live.swift

@@ -66,12 +66,15 @@ extension AccountPortfoliosClient: DependencyKey {
 		}
 
 		@Sendable
-		func fetchAccountPortfolios(_ accountAddresses: [AccountAddress], _ forceRefresh: Bool) async throws -> [AccountPortfolio] {
+		func fetchAccountPortfolios(
+			_ accountAddresses: [AccountAddress],
+			_ forceRefresh: Bool
+		) async throws -> [AccountPortfolio] {
 			let gateway = await gatewaysClient.getCurrentGateway()
 			await state.setRadixGateway(gateway)
 			if forceRefresh {
 				for accountAddress in accountAddresses {
-					cacheClient.removeFolder(.onLedgerEntity(.account(accountAddress.asGeneral)))
+					cacheClient.removeFolder(.init(address: accountAddress))
 				}
 			}
 
@@ -91,12 +94,12 @@ extension AccountPortfoliosClient: DependencyKey {
 			let allResources: [ResourceAddress] = {
 				if gateway == .mainnet {
 					/// Only Mainnet resources have prices
-					return (currentAccounts + accounts).flatMap(\.resourcesWithPrices) + [.mainnetXRDAddress]
+					return (currentAccounts + accounts).flatMap(\.resourcesWithPrices) + [.mainnetXRD]
 				} else {
 					#if DEBUG
 					/// Helpful for testing on stokenet
 					return [
-						.mainnetXRDAddress,
+						.mainnetXRD,
 						try! .init(validatingAddress:
 							"resource_rdx1t4tjx4g3qzd98nayqxm7qdpj0a0u8ns6a0jrchq49dyfevgh6u0gj3"
 						),
@@ -128,9 +131,12 @@ extension AccountPortfoliosClient: DependencyKey {
 		}
 
 		@Sendable
-		func fetchAccountPortfolio(_ accountAddress: AccountAddress, _ forceRefresh: Bool) async throws -> AccountPortfolio {
+		func fetchAccountPortfolio(
+			_ accountAddress: AccountAddress,
+			_ forceRefresh: Bool
+		) async throws -> AccountPortfolio {
 			if forceRefresh {
-				cacheClient.removeFolder(.onLedgerEntity(.account(accountAddress.asGeneral)))
+				cacheClient.removeFolder(.init(address: accountAddress))
 			}
 
 			let account = try await onLedgerEntitiesClient.getAccount(accountAddress)

RadixWallet/Clients/AccountPortfoliosClient/AccountPortfoliosClient+State.swift

@@ -2,18 +2,21 @@ import Foundation
 
 // MARK: - Definition
 extension AccountPortfoliosClient {
-	public struct AccountPortfolio: Sendable, Hashable {
+	public struct AccountPortfolio: Sendable, Hashable, CustomDebugStringConvertible {
 		public var account: OnLedgerEntity.Account
 		public var poolUnitDetails: Loadable<[OnLedgerEntitiesClient.OwnedResourcePoolDetails]> = .idle
 		public var stakeUnitDetails: Loadable<IdentifiedArrayOf<OnLedgerEntitiesClient.OwnedStakeDetails>> = .idle
 
 		var isCurrencyAmountVisible: Bool = true
 		var fiatCurrency: FiatCurrency = .usd
+		public var debugDescription: String {
+			account.debugDescription
+		}
 	}
 
 	/// Internal state that holds all loaded portfolios.
 	actor State {
-		typealias TokenPrices = [ResourceAddress: RETDecimal]
+		typealias TokenPrices = [ResourceAddress: Decimal192]
 		let portfoliosSubject: AsyncCurrentValueSubject<Loadable<[AccountAddress: AccountPortfolio]>> = .init(.loading)
 		var tokenPrices: TokenPrices = [:]
 
@@ -129,7 +132,7 @@ extension AccountPortfoliosClient.State {
 			let price = {
 				#if DEBUG
 				if gateway != .mainnet {
-					if resourceAddress == .mainnetXRDAddress {
+					if resourceAddress == .mainnetXRD {
 						return self.tokenPrices[resourceAddress]
 					} else {
 						return self.tokenPrices.values.randomElement()
@@ -198,7 +201,7 @@ private extension AccountPortfoliosClient.AccountPortfolio {
 private extension OnLedgerEntity.OwnedFungibleResources {
 	mutating func updateFiatWorth(_ change: (ResourceAddress, ResourceAmount) -> FiatWorth?) {
 		xrdResource.mutate { resource in
-			resource.amount.fiatWorth = change(.mainnetXRDAddress, resource.amount)
+			resource.amount.fiatWorth = change(.mainnetXRD, resource.amount)
 		}
 
 		nonXrdResources.mutateAll { resource in
@@ -213,7 +216,7 @@ private extension MutableCollection where Element == OnLedgerEntitiesClient.Owne
 	mutating func updateFiatWorth(_ change: (ResourceAddress, ResourceAmount) -> FiatWorth?) {
 		mutateAll { detail in
 			detail.xrdResource?.redemptionValue.mutate { amount in
-				amount.fiatWorth = change(.mainnetXRDAddress, amount)
+				amount.fiatWorth = change(.mainnetXRD, amount)
 			}
 
 			detail.nonXrdResources.mutateAll { resource in
@@ -230,11 +233,11 @@ private extension MutableCollection where Element == OnLedgerEntitiesClient.Owne
 	mutating func updateFiatWorth(_ change: (ResourceAddress, ResourceAmount) -> FiatWorth?) {
 		mutateAll { detail in
 			detail.stakeUnitResource.mutate {
-				$0.amount.fiatWorth = change(.mainnetXRDAddress, $0.amount)
+				$0.amount.fiatWorth = change(.mainnetXRD, $0.amount)
 			}
 			detail.stakeClaimTokens.mutate {
 				$0.stakeClaims.mutateAll { token in
-					token.claimAmount.fiatWorth = change(.mainnetXRDAddress, token.claimAmount)
+					token.claimAmount.fiatWorth = change(.mainnetXRD, token.claimAmount)
 				}
 			}
 		}

RadixWallet/Clients/AccountsClient/AccountsClient+Interface.swift

@@ -139,3 +139,10 @@ extension AccountsClient {
 		try await saveVirtualAccounts([account])
 	}
 }
+
+// FIXME: Delete this TEMPORARY bridge, once Wallet uses Sargon Profile!
+extension AccountsClient {
+	public func fromSargon(_ sargonAccount: Sargon.Account) async throws -> Profile.Network.Account {
+		try await getAccountByAddress(sargonAccount.address)
+	}
+}