Introduce Sargon: Radix Engine Toolkit (RET) removed

.xcode-version

@@ -1 +1 @@
-15.0.1
+15.1

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

@@ -234,15 +234,6 @@
         "revision" : "db33f4084304e2ef47c8b4d2949f0eb286f95b90"
       }
     },
-    {
-      "identity" : "swift-engine-toolkit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/radixdlt/swift-engine-toolkit",
-      "state" : {
-        "branch" : "1.0.9_update",
-        "revision" : "aa806f3c0ea38784408e70859dc3f17810fd429f"
-      }
-    },
     {
       "identity" : "swift-identified-collections",
       "kind" : "remoteSourceControl",

RadixWallet/Clients/ImportLegacyWalletClient/ImportLegacyWalletClient+Live.swift

@@ -138,7 +138,7 @@ extension ImportLegacyWalletClient: DependencyKey {
 					let setOfExistingData = try Set(babylonAddresses.map {
 						// the first byte is an address type discriminator byte, which differs between Babylon and Olympia,
 						// so we must remove it.
-						try Data(EngineToolkit.Address(address: $0.address).bytes().dropFirst())
+						try Data(RETAddress(address: $0.address).bytes().dropFirst())
 					})
 					guard let payloadByteCount = setOfExistingData.first?.count else {
 						return []

RadixWallet/Clients/OnLedgerEntitiesClient/OnLedgerEntitiesClient+Live.swift

@@ -310,7 +310,10 @@ extension CacheClient.Entry.OnLedgerEntity {
 		case let .genericComponent(genericComponent):
 			genericComponent.asGeneral
 		case let .nonFungibleData(nonFungibleId):
-			.init(address: nonFungibleId.resourceAddress().asStr(), decodedKind: .globalNonFungibleResourceManager)
+			.init(
+				address: nonFungibleId.resourceAddress().asStr(),
+				decodedKind: .globalNonFungibleResourceManager
+			)
 		case let .nonFungibleIdPage(_, resourceAddress, _):
 			resourceAddress.asGeneral
 		}

RadixWallet/Clients/ROLAClient/ROLAClient+Live.swift

@@ -1,4 +1,4 @@
-import EngineToolkit
+
 
 extension ROLAClient {
 	public static let liveValue: Self = {
@@ -19,7 +19,7 @@ extension ROLAClient {
 			let metadata = try await onLedgerEntitiesClient.getEntity(entityAddress, metadataKeys: [.ownerKeys]).genericComponent?.metadata
 			var ownerKeyHashes = try metadata?.ownerKeyHashes() ?? []
 
-			let transactionSigningKeyHash: PublicKeyHash = switch entity.securityState {
+			let transactionSigningKeyHash: RETPublicKeyHash = switch entity.securityState {
 			case let .unsecured(control):
 				try .init(hashing: control.transactionSigning.publicKey)
 			}
@@ -144,7 +144,7 @@ extension ROLAClient {
 	}
 }
 
-extension EngineToolkit.PublicKeyHash {
+extension RETPublicKeyHash {
 	public struct InvalidPublicKeyHashLength: Error {
 		public let got: Int
 		public let expected: Int
@@ -171,7 +171,7 @@ extension EngineToolkit.PublicKeyHash {
 }
 
 extension OnLedgerEntity.Metadata {
-	public func ownerKeyHashes() throws -> [EngineToolkit.PublicKeyHash]? {
+	public func ownerKeyHashes() throws -> [RETPublicKeyHash]? {
 		try ownerKeys?.value.map { hash in
 			switch hash {
 			case let .ecdsaSecp256k1(value):

RadixWallet/Clients/TransactionClient/Models/TransactionModels.swift

@@ -78,7 +78,7 @@ extension TransactionSigners {
 }
 
 extension GatewayAPI.PublicKey {
-	init(from engine: EngineToolkit.PublicKey) {
+	init(from engine: RETPublicKey) {
 		switch engine {
 		case let .secp256k1(bytes):
 			self = .ecdsaSecp256k1(.init(keyType: .ecdsaSecp256k1, keyHex: bytes.hex()))
@@ -101,11 +101,11 @@ extension GatewayAPI.PublicKey {
 
 // MARK: - NotarizeTransactionRequest
 public struct NotarizeTransactionRequest: Sendable, Hashable {
-	public let intentSignatures: Set<EngineToolkit.SignatureWithPublicKey>
+	public let intentSignatures: Set<RETSignatureWithPublicKey>
 	public let transactionIntent: TransactionIntent
 	public let notary: SLIP10.PrivateKey
 	public init(
-		intentSignatures: Set<EngineToolkit.SignatureWithPublicKey>,
+		intentSignatures: Set<RETSignatureWithPublicKey>,
 		transactionIntent: TransactionIntent,
 		notary: SLIP10.PrivateKey
 	) {

RadixWallet/Clients/TransactionClient/TransactionClient+Live.swift

@@ -49,10 +49,10 @@ extension TransactionClient {
 			func identityFromComponentAddress(_ identityAddress: IdentityAddress) async throws -> Profile.Network.Persona {
 				try await personasClient.getPersona(id: identityAddress)
 			}
-			func mapAccount(_ addresses: [EngineToolkit.Address]) throws -> OrderedSet<Profile.Network.Account> {
+			func mapAccount(_ addresses: [RETAddress]) throws -> OrderedSet<Profile.Network.Account> {
 				try .init(validating: addresses.asSpecific().compactMap(accountFromComponentAddress))
 			}
-			func mapIdentity(_ addresses: [EngineToolkit.Address]) async throws -> OrderedSet<Profile.Network.Persona> {
+			func mapIdentity(_ addresses: [RETAddress]) async throws -> OrderedSet<Profile.Network.Persona> {
 				try await .init(validating: addresses.asSpecific().asyncMap(identityFromComponentAddress))
 			}
 

RadixWallet/Core/Dictionary+Extensions.swift

@@ -0,0 +1,16 @@
+import Foundation
+
+extension Dictionary {
+	func mapKeys<U>(_ f: (Key) throws -> U) throws -> [U: Value] {
+		try mapKeyValues(f, fValue: { $0 })
+	}
+
+	func mapKeyValues<U, T>(_ fKey: (Key) throws -> U, fValue: (Value) throws -> T) throws -> [U: T] {
+		try .init(
+			map {
+				try (fKey($0.key), fValue($0.value))
+			},
+			uniquingKeysWith: { first, _ in first }
+		)
+	}
+}

RadixWallet/EngineKit/Epoch.swift → RadixWallet/Core/Epoch.swift

@@ -1,5 +1,3 @@
-import EngineToolkit
-
 // MARK: - EpochTag
 public enum EpochTag: Sendable {}
 

RadixWallet/EngineKit/Nonce.swift → RadixWallet/Core/Nonce.swift

@@ -1,4 +1,4 @@
-import EngineToolkit
+
 
 extension Nonce {
 	public static func secureRandom() -> Self {